Merge branch 'swiftlang:main' into upgrade-dont-repeat-type-in-static-properties

Author: shawnhyam

Sources/SwiftFormat/PrettyPrint/TokenStreamCreator.swift

@@ -1327,6 +1327,12 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: MacroExpansionDeclSyntax) -> SyntaxVisitorContinueKind {
+    arrangeAttributeList(node.attributes)
+
+    before(
+      node.trailingClosure?.leftBrace,
+      tokens: .break(.same, newlines: .elective(ignoresDiscretionary: true)))
+
     arrangeFunctionCallArgumentList(
       node.arguments,
       leftDelimiter: node.leftParen,
@@ -1453,6 +1459,8 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
   }
 
   override func visit(_ node: IfConfigDeclSyntax) -> SyntaxVisitorContinueKind {
+    // there has to be a break after an #endif
+    after(node.poundEndif, tokens: .break(.same, size: 0))
     return .visitChildren
   }
 

Tests/SwiftFormatTests/PrettyPrint/IfConfigTests.swift

@@ -531,4 +531,30 @@ final class IfConfigTests: PrettyPrintTestCase {
       """
     assertPrettyPrintEqual(input: input, expected: input, linelength: 45)
   }
+
+  func testNestedPoundIfInSwitchStatement() {
+    let input =
+      """
+      switch self {
+      #if os(iOS) || os(tvOS) || os(watchOS)
+      case .a:
+        return 40
+      #if os(iOS) || os(tvOS)
+      case .e:
+        return 30
+      #endif
+      #if os(iOS)
+      case .g:
+        return 2
+      #endif
+      #endif
+      default:
+        return nil
+      }
+      
+      """
+    var configuration = Configuration.forTesting
+    configuration.indentConditionalCompilationBlocks = false
+    assertPrettyPrintEqual(input: input, expected: input, linelength: 45, configuration: configuration)
+  }
 }

Tests/SwiftFormatTests/PrettyPrint/MacroCallTests.swift

@@ -114,4 +114,16 @@ final class MacroCallTests: PrettyPrintTestCase {
 
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 45)
   }
+
+  func testMacroDeclWithAttributesAndArguments() {
+    let input = """
+      @nonsenseAttribute
+      @available(iOS 17.0, *)
+      #Preview("Name") {
+        EmptyView()
+      }
+      
+      """
+    assertPrettyPrintEqual(input: input, expected: input, linelength: 45)
+  }
 }