Refactor

Author: flashspys

Sources/SwiftParser/Declarations.swift

@@ -1520,29 +1520,31 @@ extension Parser {
   ) -> RawVariableDeclSyntax {
     let (unexpectedBeforeIntroducer, introducer) = self.eat(handle)
     let hasTryBeforeIntroducer = unexpectedBeforeIntroducer?.containsToken(where: { TokenSpec(.try) ~= $0 }) ?? false
-
-    var attrs = attrs
+    
     var unexpectedBetweenBindingKeywordAndBindings: RawUnexpectedNodesSyntax?
-
+    var attrs = attrs
     var elements = [RawPatternBindingSyntax]()
     do {
       var keepGoing: RawTokenSyntax? = nil
       var loopProgress = LoopProgressCondition()
       repeat {
-
-        if (attrs.attributes?.elements.count ?? 0) == 0, self.at(.atSign), let attributes = self.parseAttributeList() {
-
-          unexpectedBetweenBindingKeywordAndBindings = RawUnexpectedNodesSyntax([attributes], arena: self.arena)
-
+          
+        if self.at(.atSign),
+            attrs.attributes?.isEmpty ?? true,
+            let recoveredAttributes = self.parseAttributeList() {
+          unexpectedBetweenBindingKeywordAndBindings = RawUnexpectedNodesSyntax([recoveredAttributes], arena: self.arena)
+          
           class TokenMissingMaker: SyntaxRewriter {
             override func visit(_ token: TokenSyntax) -> TokenSyntax {
-              return TokenSyntax(token.tokenKind, presence: .missing)
+              return .init(token.tokenKind, presence: .missing)
             }
           }
-
-          let syntaxRewriter = TokenMissingMaker(arena: self.arena)
-          let missingAttributes = syntaxRewriter.visit(Syntax(raw: attributes.raw)).raw
+          let tokenMissingMaker = TokenMissingMaker(arena: self.arena)
+          let missingAttributes = tokenMissingMaker.visit(Syntax(raw: recoveredAttributes.raw)).raw
           attrs.attributes = RawAttributeListSyntax(missingAttributes)
+
+          
+          
         }
 
         var (pattern, typeAnnotation) = self.parseTypedPattern()

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -1170,29 +1170,24 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       moveFixIt: { MoveTokensAfterFixIt(movedTokens: $0, after: .equal) },
       removeRedundantFixIt: { RemoveRedundantFixIt(removeTokens: $0) }
     )
-
-    if let unexpected = node.unexpectedBetweenBindingKeywordAndBindings {
-
-      let fixit = FixIt(
-        message: MoveNodesInFrontOfFixIt(
-          movedNodes: [unexpected],
-          inFrontOf: node.bindingKeyword.tokenKind
-        ),
-        changes: [
-          .makeMissing(unexpected),
-          .makePresent(node.attributes!, trailingTrivia: .space),
-        ]
-      )
-
-      addDiagnostic(
-        unexpected,
-        .misplacedAttributeInVarDecl,
-        fixIts: [fixit],
-        handledNodes: [unexpected.id, node.attributes!.id]
-      )
-
-    }
-
+    
+    if let attributes = node.attributes,
+       attributes.isMissingAllTokens,
+       let unexpected = node.unexpectedBetweenBindingKeywordAndBindings {
+      
+      let fixit = FixIt(message: MoveNodesInFrontOfFixIt(movedNodes: [unexpected], inFrontOf: node.bindingKeyword.tokenKind),
+                        changes: [
+                          .makeMissing(unexpected),
+                          .makePresent(attributes, trailingTrivia: .space)
+                        ])
+      
+      addDiagnostic(unexpected,
+                    .misplacedAttributeInVarDecl,
+                    fixIts: [fixit],
+                    handledNodes: [attributes.id, unexpected.id])
+      
+    }
+    
     return .visitChildren
   }
 

Tests/SwiftParserTest/AttributeTests.swift

@@ -570,21 +570,21 @@ final class AttributeTests: XCTestCase {
       """
     )
   }
-
-  func testMisplacedAttributeInVar() {
+    
+  func testMisplacedAttributeInVariableDecl() {
     AssertParse(
       """
       struct A {
-        var 1️⃣@Bar i: Foo
+        var 1️⃣@State name: String
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "misplaced attribute in variable declaration", fixIts: ["move attributes in front of 'var'"])
+        DiagnosticSpec(message: "misplaced attribute in variable declaration", fixIts: ["move attributes in front of 'var'"]),
       ],
       fixedSource:
         """
         struct A {
-          @Bar var i: Foo
+          @State var name: String
         }
         """
     )