Skip to content

Remove macro special cases #453

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 3 commits into from
Dec 11, 2022
Merged

Remove macro special cases #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
025bed9
Handle removal of special syntax nodes for #selector and #keyPath.
DougGregor Dec 10, 2022
c324a11
Remove unnecesssary special cases for "#" syntax that's going away
DougGregor Dec 10, 2022
a26a284
Remove visitor override for unused ObjectLiteralExprSyntax
DougGregor Dec 10, 2022
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
54 changes: 0 additions & 54 deletions Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,22 +1209,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .skipChildren
}

override func visit(_ node: ObjcKeyPathExprSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: ObjectLiteralExprSyntax) -> SyntaxVisitorContinueKind {
// TODO: Remove this; it has been subsumed by `MacroExpansionDeclSyntax`. But that feature is
// still in flux and this node type is still present in the API, even though nothing in the
// parser currently creates it.
arrangeFunctionCallArgumentList(
node.arguments,
leftDelimiter: node.leftParen,
rightDelimiter: node.rightParen,
forcesBreakBeforeRightDelimiter: false)
return .visitChildren
}

override func visit(_ node: MacroExpansionDeclSyntax) -> SyntaxVisitorContinueKind {
arrangeFunctionCallArgumentList(
node.argumentList,
Expand Down Expand Up @@ -1408,12 +1392,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .visitChildren
}

override func visit(_ node: ObjcSelectorExprSyntax) -> SyntaxVisitorContinueKind {
after(node.leftParen, tokens: .break(.open, size: 0), .open)
before(node.rightParen, tokens: .break(.close(mustBreak: false), size: 0), .close)
return .visitChildren
}

override func visit(_ node: ObjCSelectorSyntax) -> SyntaxVisitorContinueKind {
insertTokens(.break(.same, size: 0), betweenElementsOf: node)
return .visitChildren
Expand Down Expand Up @@ -2005,18 +1983,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .visitChildren
}

override func visit(_ node: ObjcNamePieceSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: PoundFileExprSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: PoundLineExprSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: TypealiasDeclSyntax) -> SyntaxVisitorContinueKind {
arrangeAttributeList(node.attributes)

Expand Down Expand Up @@ -2055,10 +2021,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .visitChildren
}

override func visit(_ node: PoundErrorDeclSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: SpecializeExprSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}
Expand Down Expand Up @@ -2108,10 +2070,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .visitChildren
}

override func visit(_ node: PoundColumnExprSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: WildcardPatternSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}
Expand Down Expand Up @@ -2145,10 +2103,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .visitChildren
}

override func visit(_ node: PoundWarningDeclSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: ExpressionPatternSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}
Expand All @@ -2173,10 +2127,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .visitChildren
}

override func visit(_ node: PoundFunctionExprSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: StringLiteralExprSyntax) -> SyntaxVisitorContinueKind {
if node.openQuote.tokenKind == .multilineStringQuote {
// If it's a multiline string, the last segment of the literal will end with a newline and
Expand Down Expand Up @@ -2242,10 +2192,6 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
return .visitChildren
}

override func visit(_ node: PoundDsohandleExprSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}

override func visit(_ node: AccessPathComponentSyntax) -> SyntaxVisitorContinueKind {
return .visitChildren
}
Expand Down
12 changes: 8 additions & 4 deletions Tests/SwiftFormatPrettyPrintTests/DeclNameArgumentTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ final class DeclNameArgumentTests: PrettyPrintTestCase {
thirdArg:
fourthArg:
fifthArg:
))
)
)
let selector = #selector(
FooClass.method(firstArg:secondArg:))
FooClass.method(firstArg:secondArg:)
)
let selector = #selector(
FooClass.VeryDeeply.NestedInner.Member
.foo(firstArg:secondArg:))
.foo(firstArg:secondArg:)
)
let selector = #selector(
FooClass.VeryDeeply.NestedInner.Member
.foo(
Expand All @@ -33,7 +36,8 @@ final class DeclNameArgumentTests: PrettyPrintTestCase {
thirdArg:
fourthArg:
fifthArg:
))
)
)

"""

Expand Down