Skip to content

Fix Regression in Leading Unexpected Tokens for Declarations #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2022
Merged

Fix Regression in Leading Unexpected Tokens for Declarations #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Sources/SwiftParser/Declarations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,7 @@ extension Parser {
return RawClassDeclSyntax(
attributes: attrs.attributes,
modifiers: attrs.modifiers,
unexpectedBeforeClassKeyword,
classKeyword: classKeyword,
unexpectedBeforeName,
identifier: name,
Expand Down Expand Up @@ -694,6 +695,7 @@ extension Parser {
let members = self.parseMemberDeclList()
return RawEnumDeclSyntax(
attributes: attrs.attributes, modifiers: attrs.modifiers,
unexpectedBeforeEnumKeyword,
enumKeyword: enumKeyword,
unexpectedBeforeName,
identifier: name,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -938,6 +941,7 @@ extension Parser {

return RawProtocolDeclSyntax(
attributes: attrs.attributes, modifiers: attrs.modifiers,
unexpectedBeforeProtocolKeyword,
protocolKeyword: protocolKeyword,
identifier: name,
primaryAssociatedTypeClause: primaries,
Expand Down Expand Up @@ -1003,6 +1007,7 @@ extension Parser {

return RawAssociatedtypeDeclSyntax(
attributes: attrs.attributes, modifiers: attrs.modifiers,
unexpectedBeforeAssocKeyword,
associatedtypeKeyword: assocKeyword,
identifier: name,
inheritanceClause: inheritance,
Expand Down
49 changes: 49 additions & 0 deletions Tests/SwiftParserTest/Declarations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down