Fix spans for enum-struct match arms

Correct spans for fields in enum struct arms where the field and variable are unified