Make unowned parsing accept RecoveryConsumptionHandle

Mark modifiers after fixity unexpected

Author: StevenWong12

Sources/SwiftParser/Declarations.swift

@@ -1717,26 +1717,31 @@ extension Parser {
     var unexpectedBeforeFixity = RawUnexpectedNodesSyntax(attrs.attributes?.elements ?? [], arena: self.arena)
 
     var fixity: RawTokenSyntax?
-    var leftInFixityModifier: RawUnexpectedNodesSyntax?
+    var unexpectedAfterFixity: RawUnexpectedNodesSyntax?
 
     if let modifiers = attrs.modifiers?.elements {
       if let firstFixityIndex = modifiers.firstIndex(where: { isFixity($0) }) {
         let fixityModifier = modifiers[firstFixityIndex]
         fixity = fixityModifier.name
 
-        leftInFixityModifier = RawUnexpectedNodesSyntax(combining: fixityModifier.unexpectedBetweenNameAndDetail, RawUnexpectedNodesSyntax([fixityModifier.detail], arena: self.arena), fixityModifier.unexpectedAfterDetail, arena: self.arena)
+        unexpectedBeforeFixity = RawUnexpectedNodesSyntax(combining: unexpectedBeforeFixity, RawUnexpectedNodesSyntax(Array(modifiers[0..<firstFixityIndex]), arena: self.arena), fixityModifier.unexpectedBeforeName, arena: self.arena)
 
-        let beforeFixity = Array(modifiers[0..<firstFixityIndex])
+        unexpectedAfterFixity = RawUnexpectedNodesSyntax(
+          combining: fixityModifier.unexpectedBetweenNameAndDetail,
+          RawUnexpectedNodesSyntax([fixityModifier.detail], arena: self.arena),
+          fixityModifier.unexpectedAfterDetail,
+          RawUnexpectedNodesSyntax(Array(modifiers[modifiers.index(after: firstFixityIndex)...]), arena: self.arena),
+          arena: self.arena
+        )
 
-        unexpectedBeforeFixity = RawUnexpectedNodesSyntax(combining: unexpectedBeforeFixity, RawUnexpectedNodesSyntax(beforeFixity, arena: self.arena), fixityModifier.unexpectedBeforeName, arena: self.arena)
       } else {
         unexpectedBeforeFixity = RawUnexpectedNodesSyntax(combining: unexpectedBeforeFixity, RawUnexpectedNodesSyntax(modifiers, arena: self.arena), arena: self.arena)
       }
     }
 
     var (unexpectedBeforeOperatorKeyword, operatorKeyword) = self.expect(.keyword(.operator))
 
-    unexpectedBeforeOperatorKeyword = RawUnexpectedNodesSyntax(combining: leftInFixityModifier, unexpectedBeforeOperatorKeyword, arena: self.arena)
+    unexpectedBeforeOperatorKeyword = RawUnexpectedNodesSyntax(combining: unexpectedAfterFixity, unexpectedBeforeOperatorKeyword, arena: self.arena)
 
     return OperatorDeclIntroducer(
       unexpectedBeforeFixity: unexpectedBeforeFixity,

Sources/SwiftParser/Modifiers.swift

@@ -58,8 +58,8 @@ extension Parser {
         } else {
           break MODIFIER_LOOP
         }
-      case (.declarationModifier(.unowned), _)?:
-        elements.append(self.parseUnownedModifier())
+      case (.declarationModifier(.unowned), let handle)?:
+        elements.append(self.parseUnownedModifier(handle))
       case (.declarationModifier(.final), let handle)?,
         (.declarationModifier(.required), let handle)?,
         (.declarationModifier(.optional), let handle)?,
@@ -113,8 +113,8 @@ extension Parser {
     )
   }
 
-  mutating func parseUnownedModifier() -> RawDeclModifierSyntax {
-    let (unexpectedBeforeKeyword, keyword) = self.expect(.keyword(.unowned))
+  mutating func parseUnownedModifier(_ handle: RecoveryConsumptionHandle) -> RawDeclModifierSyntax {
+    let (unexpectedBeforeKeyword, keyword) = self.eat(handle)
 
     let detail: RawDeclModifierDetailSyntax?
     if self.at(.leftParen) {

Sources/SwiftParser/SyntaxUtils.swift

@@ -80,6 +80,10 @@ extension RawUnexpectedNodesSyntax {
   init?(combining syntax1: some UnexpectedNodesCombinable, _ syntax2: some UnexpectedNodesCombinable, _ syntax3: some UnexpectedNodesCombinable, arena: __shared SyntaxArena) {
     self.init(syntax1.elements + syntax2.elements + syntax3.elements, arena: arena)
   }
+
+  init?(combining syntax1: some UnexpectedNodesCombinable, _ syntax2: some UnexpectedNodesCombinable, _ syntax3: some UnexpectedNodesCombinable, _ syntax4: some UnexpectedNodesCombinable, arena: __shared SyntaxArena) {
+    self.init(syntax1.elements + syntax2.elements + syntax3.elements + syntax4.elements, arena: arena)
+  }
 }
 
 // MARK: - Misc

Tests/SwiftParserTest/DeclarationTests.swift

@@ -2163,4 +2163,31 @@ final class DeclarationTests: XCTestCase {
       ]
     )
   }
+
+  func testUnexpectedTokenInClassFollowedByUnownedModifier() {
+    assertParse(
+      """
+      class A ℹ️{
+        1️⃣^
+      }
+      unowned 2️⃣B 3️⃣{
+      }4️⃣
+      """,
+      diagnostics: [
+        DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code before modifier"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "expected 'func' in function", fixIts: ["insert 'func'"]),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "expected parameter clause in function signature", fixIts: ["insert parameter clause"]),
+        DiagnosticSpec(locationMarker: "4️⃣", message: "expected '}' to end class", notes: [NoteSpec(message: "to match this opening '{'")], fixIts: ["insert '}'"]),
+      ],
+      fixedSource:
+        """
+        class A {
+          ^
+        }
+        unowned func B() {
+        }
+        }
+        """
+    )
+  }
 }

Tests/SwiftParserTest/translated/OperatorDeclTests.swift

@@ -598,6 +598,17 @@ final class OperatorDeclTests: XCTestCase {
     )
   }
 
+  func testMultipleFixity() {
+    assertParse(
+      """
+      prefix 1️⃣infix operator &+&
+      """,
+      diagnostics: [
+        DiagnosticSpec(message: "unexpected code 'infix' in operator declaration")
+      ]
+    )
+  }
+
   func testIdentifierAsOperatorName() {
     assertParse(
       "postfix operator 1️⃣aa",