Merge pull request swiftlang#453 from DougGregor/remove-macro-special-cases

Author: DougGregor

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -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,
@@ -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
@@ -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)
 
@@ -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
   }
@@ -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
   }
@@ -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
   }
@@ -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
@@ -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
   }

Tests/SwiftFormatPrettyPrintTests/DeclNameArgumentTests.swift

@@ -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(
@@ -33,7 +36,8 @@ final class DeclNameArgumentTests: PrettyPrintTestCase {
             thirdArg:
             fourthArg:
             fifthArg:
-          ))
+          )
+      )
 
       """