fix whitespace roundtripping?

wyattscarpenter · wyattscarpenter · commit 69b0ce77a389 · 2024-10-06T19:50:10.000-07:00
diff --git a/mypy/fastparse.py b/mypy/fastparse.py
@@ -175,15 +175,15 @@ def p() -> AST:
                 else (
                     s[:-1]
                     if is_defective_version
-                    and hasattr(
-                        tokenize, "FSTRING_MIDDLE"
-                    )  # technically redundant as all the defective versions have this, but we'd like to appease the typechecker here
+                    # Technically redundant hasattr check as all the defective versions are versions that have this attribute, but we'd like to appease the typechecker here:
+                    and hasattr(tokenize, "FSTRING_MIDDLE")
                     and t == tokenize.FSTRING_MIDDLE
                     and s.startswith("\\")
                     and s.endswith("{")
                     else s
                 )
             ),
+            *_ #this improves whitespace roundtripping (possibly always making it perfect, for this usecase?)
         )
         for t, s, *_ in tokens
     )

Original file line number	Diff line number	Diff line change
`@@ -175,15 +175,15 @@ def p() -> AST:`
`175`	`175`	`else (`
`176`	`176`	`s[:-1]`
`177`	`177`	`if is_defective_version`
`178`		`- and hasattr(`
`179`		`- tokenize, "FSTRING_MIDDLE"`
`180`		`- ) # technically redundant as all the defective versions have this, but we'd like to appease the typechecker here`
	`178`	`+ # Technically redundant hasattr check as all the defective versions are versions that have this attribute, but we'd like to appease the typechecker here:`
	`179`	`+ and hasattr(tokenize, "FSTRING_MIDDLE")`
`181`	`180`	`and t == tokenize.FSTRING_MIDDLE`
`182`	`181`	`and s.startswith("\\")`
`183`	`182`	`and s.endswith("{")`
`184`	`183`	`else s`
`185`	`184`	`)`
`186`	`185`	`),`
	`186`	`+ *_ #this improves whitespace roundtripping (possibly always making it perfect, for this usecase?)`
`187`	`187`	`)`
`188`	`188`	`for t, s, *_ in tokens`
`189`	`189`	`)`