Fix Regression in Leading Unexpected Tokens for Declarations

This was introduced while migrating their introducers from eat to expect.

Author: CodaFi

Sources/SwiftParser/Declarations.swift

@@ -577,6 +577,7 @@ extension Parser {
     return RawClassDeclSyntax(
       attributes: attrs.attributes,
       modifiers: attrs.modifiers,
+      unexpectedBeforeClassKeyword,
       classKeyword: classKeyword,
       unexpectedBeforeName,
       identifier: name,
@@ -694,6 +695,7 @@ extension Parser {
     let members = self.parseMemberDeclList()
     return RawEnumDeclSyntax(
       attributes: attrs.attributes, modifiers: attrs.modifiers,
+      unexpectedBeforeEnumKeyword,
       enumKeyword: enumKeyword,
       unexpectedBeforeName,
       identifier: name,
@@ -831,6 +833,7 @@ extension Parser {
     let members = self.parseMemberDeclList()
     return RawStructDeclSyntax(
       attributes: attrs.attributes, modifiers: attrs.modifiers,
+      unexpectedBeforeStructKeyword,
       structKeyword: structKeyword,
       identifier: name,
       genericParameterClause: generics,
@@ -938,6 +941,7 @@ extension Parser {
 
     return RawProtocolDeclSyntax(
       attributes: attrs.attributes, modifiers: attrs.modifiers,
+      unexpectedBeforeProtocolKeyword,
       protocolKeyword: protocolKeyword,
       identifier: name,
       primaryAssociatedTypeClause: primaries,
@@ -1003,6 +1007,7 @@ extension Parser {
 
     return RawAssociatedtypeDeclSyntax(
       attributes: attrs.attributes, modifiers: attrs.modifiers,
+      unexpectedBeforeAssocKeyword,
       associatedtypeKeyword: assocKeyword,
       identifier: name,
       inheritanceClause: inheritance,

Sources/SwiftSyntaxParser/SyntaxParser.swift

@@ -142,14 +142,14 @@ public enum SyntaxParser {
     let arena = SyntaxArena()
     let sourceBuffer = source.withUTF8 { arena.internSourceBuffer($0) }
 
-    if let languageVersion = languageVersion {
-      languageVersion.withCString { languageVersionCString in
-        swiftparse_parser_set_language_version(c_parser, languageVersionCString)
-      }
-    }
-    if let enableBareSlashRegexLiteral = enableBareSlashRegexLiteral {
-      swiftparse_parser_set_enable_bare_slash_regex_literal(c_parser, enableBareSlashRegexLiteral)
-    }
+//    if let languageVersion = languageVersion {
+//      languageVersion.withCString { languageVersionCString in
+//        swiftparse_parser_set_language_version(c_parser, languageVersionCString)
+//      }
+//    }
+//    if let enableBareSlashRegexLiteral = enableBareSlashRegexLiteral {
+//      swiftparse_parser_set_enable_bare_slash_regex_literal(c_parser, enableBareSlashRegexLiteral)
+//    }
 
     let nodeHandler = { (cnode: CSyntaxNodePtr!) -> UnsafeMutableRawPointer in
       RawSyntax.getOpaqueFromCNode(cnode, in: sourceBuffer, arena: arena)

Tests/SwiftParserTest/Declarations.swift

@@ -804,6 +804,55 @@ final class DeclarationTests: XCTestCase {
       }
       """##)
   }
+
+  func testLeadingUnexpectedTokens() {
+    AssertParse("#^DIAG_1^#}class C#^DIAG_2^#",
+                diagnostics: [
+                  DiagnosticSpec(locationMarker: "DIAG_1", message: "Unexpected text '}' before class"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '{' to start class"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '}' to end class"),
+                ])
+    AssertParse("#^DIAG_1^#}enum C#^DIAG_2^#",
+                diagnostics: [
+                  DiagnosticSpec(locationMarker: "DIAG_1", message: "Unexpected text '}' before enum"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '{' to start enum"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '}' to end enum"),
+                ])
+    AssertParse("#^DIAG_1^#}protocol C#^DIAG_2^#",
+                diagnostics: [
+                  DiagnosticSpec(locationMarker: "DIAG_1", message: "Unexpected text '}' before protocol"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '{' to start protocol"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '}' to end protocol"),
+                ])
+    AssertParse("#^DIAG_1^#}actor C#^DIAG_2^#",
+                diagnostics: [
+                  DiagnosticSpec(locationMarker: "DIAG_1", message: "Unexpected text '}' before actor"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '{' to start actor"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '}' to end actor"),
+                ])
+    AssertParse("#^DIAG_1^#}struct C#^DIAG_2^#",
+                diagnostics: [
+                  DiagnosticSpec(locationMarker: "DIAG_1", message: "Unexpected text '}' before struct"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '{' to start struct"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '}' to end struct"),
+                ])
+    AssertParse("#^DIAG_1^#}func C#^DIAG_2^#",
+                diagnostics: [
+                  DiagnosticSpec(locationMarker: "DIAG_1", message: "Unexpected text '}' before function"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected argument list in function declaration"),
+                ])
+    AssertParse("#^DIAG_1^#}init#^DIAG_2^#",
+                diagnostics: [
+                  DiagnosticSpec(locationMarker: "DIAG_1", message: "Unexpected text '}' before initializer"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected argument list in function declaration"),
+                ])
+    AssertParse("#^DIAG_1^#}subscript#^DIAG_2^#",
+                diagnostics: [
+                  DiagnosticSpec(locationMarker: "DIAG_1", message: "Unexpected text '}' before subscript"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected argument list in function declaration"),
+                  DiagnosticSpec(locationMarker: "DIAG_2", message: "Expected '->' in return clause"),
+                ])
+  }
 }
 
 extension Parser.DeclAttributes {