Skip to content

Rename nameForDiagnostics 'function parameter' -> 'parameter' #966

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
Oct 18, 2022
Merged

Rename nameForDiagnostics 'function parameter' -> 'parameter' #966

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
4 changes: 2 additions & 2 deletions CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public let DECL_NODES: [Node] = [
]),

Node(name: "FunctionParameterList",
nameForDiagnostics: "function parameter list",
nameForDiagnostics: "parameter list",
kind: "SyntaxCollection",
element: "FunctionParameter"),

Expand Down Expand Up @@ -712,7 +712,7 @@ public let DECL_NODES: [Node] = [
]),

Node(name: "FunctionParameter",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the node names be renamed 🤔?

nameForDiagnostics: "function parameter",
nameForDiagnostics: "parameter",
kind: "Syntax",
traits: [
"WithTrailingComma"
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftSyntax/gyb_generated/SyntaxEnum.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ public enum SyntaxEnum {
case .associatedtypeDecl:
return "associatedtype declaration"
case .functionParameterList:
return "function parameter list"
return "parameter list"
case .parameterClause:
return "parameter clause"
case .returnClause:
Expand Down Expand Up @@ -556,7 +556,7 @@ public enum SyntaxEnum {
case .initializerClause:
return nil
case .functionParameter:
return "function parameter"
return "parameter"
case .modifierList:
return nil
case .functionDecl:
Expand Down
16 changes: 8 additions & 8 deletions Tests/SwiftParserTest/Declarations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ final class DeclarationTests: XCTestCase {
"(first second 1️⃣Int)",
{ $0.parseFunctionSignature() },
diagnostics: [
DiagnosticSpec(message: "expected ':' in function parameter")
DiagnosticSpec(message: "expected ':' in parameter")
]
)
}
Expand All @@ -584,7 +584,7 @@ final class DeclarationTests: XCTestCase {
"(first second 1️⃣third fourth: Int)",
{ $0.parseFunctionSignature() },
diagnostics: [
DiagnosticSpec(message: "unexpected code 'third fourth' in function parameter")
DiagnosticSpec(message: "unexpected code 'third fourth' in parameter")
]
)
}
Expand Down Expand Up @@ -771,7 +771,7 @@ final class DeclarationTests: XCTestCase {
trailingComma: nil
)),
diagnostics: [
DiagnosticSpec(message: "unexpected code 'third' in function parameter")
DiagnosticSpec(message: "unexpected code 'third' in parameter")
]
)
}
Expand All @@ -793,7 +793,7 @@ final class DeclarationTests: XCTestCase {
trailingComma: nil
)),
diagnostics: [
DiagnosticSpec(message: "unexpected code 'third fourth' in function parameter")
DiagnosticSpec(message: "unexpected code 'third fourth' in parameter")
]
)
}
Expand All @@ -813,7 +813,7 @@ final class DeclarationTests: XCTestCase {
trailingComma: nil
)),
diagnostics: [
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in function parameter"),
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
DiagnosticSpec(locationMarker: "3️⃣", message: "expected ')' to end parameter clause"),
DiagnosticSpec(locationMarker: "4️⃣", message: "expected name and member block in struct"),
DiagnosticSpec(locationMarker: "4️⃣", message: "extraneous code ': Int) {}' at top level"),
Expand Down Expand Up @@ -843,7 +843,7 @@ final class DeclarationTests: XCTestCase {
trailingComma: nil
)),
diagnostics: [
DiagnosticSpec(message: "unexpected code '[third fourth]' in function parameter")
DiagnosticSpec(message: "unexpected code '[third fourth]' in parameter")
]
)
}
Expand All @@ -867,7 +867,7 @@ final class DeclarationTests: XCTestCase {
trailingComma: nil
)),
diagnostics: [
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in function parameter"),
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
DiagnosticSpec(locationMarker: "2️⃣" , message: "expected ']' to end array type"),
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code 'fourth: Int' in parameter clause")
]
Expand All @@ -892,7 +892,7 @@ final class DeclarationTests: XCTestCase {
trailingComma: nil
)),
diagnostics: [
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in function parameter"),
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ')' to end parameter clause"),
DiagnosticSpec(locationMarker: "3️⃣", message: "extraneous code ': Int) {}' at top level")
]
Expand Down
2 changes: 1 addition & 1 deletion Tests/SwiftParserTest/translated/DollarIdentifierTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ final class DollarIdentifierTests: XCTestCase {
// TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 10 - 11 = '`$`'
DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in function"),
DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code '$' before parameter clause"),
DiagnosticSpec(locationMarker: "2️⃣", message: "expected type in function parameter"),
DiagnosticSpec(locationMarker: "2️⃣", message: "expected type in parameter"),
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '$ dollarParam: Int' in parameter clause"),
// TODO: Old parser expected error on line 3: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 3 - 4 = '`$`'
// TODO: Old parser expected error on line 3: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 5 - 6 = '`$`'
Expand Down
27 changes: 5 additions & 22 deletions Tests/SwiftParserTest/translated/EnumTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ final class EnumTests: XCTestCase {
1️⃣case FloatingCase
""",
diagnostics: [
// TODO: Old parser expected error on line 2: enum 'case' is not allowed outside of an enum
DiagnosticSpec(message: "'case' can only appear inside a 'switch' statement or 'enum' declaration"),
]
)
Expand All @@ -116,10 +115,7 @@ final class EnumTests: XCTestCase {
struct SomeStruct {
case StructCase
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: enum 'case' is not allowed outside of an enum
]
"""
)
}

Expand All @@ -129,10 +125,7 @@ final class EnumTests: XCTestCase {
class SomeClass {
case ClassCase
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: enum 'case' is not allowed outside of an enum
]
"""
)
}

Expand All @@ -145,10 +138,7 @@ final class EnumTests: XCTestCase {
extension EnumWithExtension1 {
case A2
}
""",
diagnostics: [
// TODO: Old parser expected error on line 5: enum 'case' is not allowed outside of an enum
]
"""
)
}

Expand Down Expand Up @@ -179,7 +169,6 @@ final class EnumTests: XCTestCase {
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
DiagnosticSpec(message: "unexpected code ':' in enum"),
]
)
Expand All @@ -193,7 +182,6 @@ final class EnumTests: XCTestCase {
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
DiagnosticSpec(message: "unexpected code ':' in enum"),
]
)
Expand All @@ -207,7 +195,6 @@ final class EnumTests: XCTestCase {
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
DiagnosticSpec(message: "unexpected code ':' in enum"),
]
)
Expand All @@ -221,7 +208,6 @@ final class EnumTests: XCTestCase {
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
DiagnosticSpec(message: "unexpected code 'where true:' in enum"),
]
)
Expand All @@ -235,7 +221,6 @@ final class EnumTests: XCTestCase {
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
DiagnosticSpec(message: "unexpected code ':' in enum"),
]
)
Expand All @@ -249,7 +234,6 @@ final class EnumTests: XCTestCase {
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
DiagnosticSpec(message: "unexpected code 'where true:' in enum"),
]
)
Expand All @@ -263,7 +247,6 @@ final class EnumTests: XCTestCase {
}
""",
diagnostics: [
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
DiagnosticSpec(locationMarker: "1️⃣", message: "name can only start with a letter or underscore, not a number"),
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code ':' in enum"),
]
Expand Down Expand Up @@ -294,8 +277,8 @@ final class EnumTests: XCTestCase {
diagnostics: [
// TODO: Old parser expected error on line 2: 'case' label can only appear inside a 'switch' statement
DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in enum case"),
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ':' and type in function parameter"),
DiagnosticSpec(locationMarker: "3️⃣", message: "expected type in function parameter"),
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ':' and type in parameter"),
DiagnosticSpec(locationMarker: "3️⃣", message: "expected type in parameter"),
DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code '0' in parameter clause"),
DiagnosticSpec(locationMarker: "4️⃣", message: "unexpected code ':' in enum"),
]
Expand Down
6 changes: 3 additions & 3 deletions Tests/SwiftParserTest/translated/InitDeinitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ final class InitDeinitTests: XCTestCase {
""",
diagnostics: [
// TODO: Old parser expected error on line 3: missing 'self.' at initializer invocation, Fix-It replacements: 24 - 24 = 'self.'
DiagnosticSpec(message: "expected type in function parameter"),
DiagnosticSpec(message: "expected type in parameter"),
DiagnosticSpec(message: "unexpected code '1' in parameter clause"),
]
)
Expand All @@ -356,7 +356,7 @@ final class InitDeinitTests: XCTestCase {
""",
diagnostics: [
// TODO: Old parser expected error on line 3: missing 'super.' at initializer invocation, Fix-It replacements: 5 - 5 = 'super.'
DiagnosticSpec(message: "expected type in function parameter"),
DiagnosticSpec(message: "expected type in parameter"),
DiagnosticSpec(message: "unexpected code '2' in parameter clause"),
]
)
Expand All @@ -372,7 +372,7 @@ final class InitDeinitTests: XCTestCase {
""",
diagnostics: [
// TODO: Old parser expected error on line 3: missing 'self.' at initializer invocation, Fix-It replacements: 12 - 12 = 'self.'
DiagnosticSpec(message: "expected type in function parameter"),
DiagnosticSpec(message: "expected type in parameter"),
DiagnosticSpec(message: "unexpected code '1' in parameter clause"),
]
)
Expand Down
4 changes: 2 additions & 2 deletions Tests/SwiftParserTest/translated/InvalidTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ final class InvalidTests: XCTestCase {
}
""",
diagnostics: [
DiagnosticSpec(message: "expected ':' and type in function parameter"),
DiagnosticSpec(message: "expected ':' and type in parameter"),
]
)
}
Expand Down Expand Up @@ -283,7 +283,7 @@ final class InvalidTests: XCTestCase {
""",
diagnostics: [
// TODO: Old parser expected warning on line 3: 'let' in this position is interpreted as an argument label, Fix-It replacements: 15 - 18 = '`let`'
DiagnosticSpec(message: "unexpected code 'a' in function parameter"),
DiagnosticSpec(message: "unexpected code 'a' in parameter"),
]
)
}
Expand Down
4 changes: 2 additions & 2 deletions gyb_syntax_support/DeclNodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
is_optional=True),
]),

Node('FunctionParameterList', name_for_diagnostics='function parameter list',
Node('FunctionParameterList', name_for_diagnostics='parameter list',
kind='SyntaxCollection', element='FunctionParameter'),

Node('ParameterClause', name_for_diagnostics='parameter clause', kind='Syntax',
Expand Down Expand Up @@ -374,7 +374,7 @@
# parameter ->
# external-parameter-name? local-parameter-name ':'
# type '...'? '='? expression? ','?
Node('FunctionParameter', name_for_diagnostics='function parameter', kind='Syntax',
Node('FunctionParameter', name_for_diagnostics='parameter', kind='Syntax',
traits=['WithTrailingComma'],
children=[
Child('Attributes', kind='AttributeList', name_for_diagnostics='attributes',
Expand Down