Merge pull request #720 from ahoppen/6.0/merge-main-2024-04-18

Author: ahoppen

README.md

@@ -73,7 +73,7 @@ Run `brew install swift-format` to install the latest version.
 Install `swift-format` using the following commands:
 
 ```sh
-VERSION=509.0.0  # replace this with the version you need
+VERSION=510.1.0  # replace this with the version you need
 git clone https://github.com/apple/swift-format.git
 cd swift-format
 git checkout "tags/$VERSION"

Sources/SwiftFormat/API/Configuration.swift

@@ -167,7 +167,7 @@ public struct Configuration: Codable, Equatable {
   ///
   /// When `true` (default), the correct form is:
   /// ```swift
-  /// let MyCollection = [1, 2,]
+  /// let MyCollection = [1, 2]
   /// ...
   /// let MyCollection = [
   ///   "a": 1,

Sources/SwiftFormat/Core/Trivia+Convenience.swift

@@ -80,7 +80,7 @@ extension Trivia {
       })
   }
 
-  /// Returns `true` if this trivia contains any backslahes (used for multiline string newline
+  /// Returns `true` if this trivia contains any backslashes (used for multiline string newline
   /// suppression).
   var containsBackslashes: Bool {
     return contains(

Sources/SwiftFormat/PrettyPrint/TokenStreamCreator.swift

@@ -1799,6 +1799,17 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
     return .visitChildren
   }
 
+  override func visit(_ node: OriginallyDefinedInAttributeArgumentsSyntax) -> SyntaxVisitorContinueKind {
+    after(node.colon.lastToken(viewMode: .sourceAccurate), tokens: .break(.same, size: 1))
+    after(node.comma.lastToken(viewMode: .sourceAccurate), tokens: .break(.same, size: 1))
+      return .visitChildren
+  }
+
+  override func visit(_ node: DocumentationAttributeArgumentSyntax) -> SyntaxVisitorContinueKind {
+    after(node.colon, tokens: .break(.same, size: 1))
+    return .visitChildren
+  }
+
   override func visit(_ node: AvailabilityLabeledArgumentSyntax) -> SyntaxVisitorContinueKind {
     before(node.label, tokens: .open)
 

Sources/SwiftFormat/Rules/AlwaysUseLiteralForEmptyCollectionInit.swift

@@ -86,7 +86,7 @@ public final class AlwaysUseLiteralForEmptyCollectionInit : SyntaxFormatRule {
     if replacement.typeAnnotation == nil {
       // Drop trailing trivia after pattern because ':' has to appear connected to it.
       replacement.pattern = node.pattern.with(\.trailingTrivia, [])
-      // Add explicit type annotiation: ': [<Type>]`
+      // Add explicit type annotation: ': [<Type>]`
       replacement.typeAnnotation = .init(type: type.with(\.leadingTrivia, .space)
                                                    .with(\.trailingTrivia, .space))
     }
@@ -109,7 +109,7 @@ public final class AlwaysUseLiteralForEmptyCollectionInit : SyntaxFormatRule {
     if replacement.typeAnnotation == nil {
       // Drop trailing trivia after pattern because ':' has to appear connected to it.
       replacement.pattern = node.pattern.with(\.trailingTrivia, [])
-      // Add explicit type annotiation: ': [<Type>]`
+      // Add explicit type annotation: ': [<Type>]`
       replacement.typeAnnotation = .init(type: type.with(\.leadingTrivia, .space)
                                                    .with(\.trailingTrivia, .space))
     }

Sources/_SwiftFormatTestSupport/Configuration+Testing.swift

@@ -20,7 +20,7 @@ extension Configuration {
   /// different module than where `Configuration` is defined, we can't make this an initializer that
   /// would enforce that every field of `Configuration` is initialized here (we're forced to
   /// delegate to another initializer first, which defeats the purpose). So, users adding new
-  /// configuration settings shouls be sure to supply a default here for testing, otherwise they
+  /// configuration settings should be sure to supply a default here for testing, otherwise they
   /// will be implicitly relying on the real default.
   public static var forTesting: Configuration {
     var config = Configuration()

Sources/swift-format/Utilities/FileIterator.swift

@@ -132,7 +132,7 @@ public struct FileIterator: Sequence, IteratorProtocol {
       case .typeRegular:
         // We attempt to relativize the URLs based on the current working directory, not the
         // directory being iterated over, so that they can be displayed better in diagnostics. Thus,
-        // if the user passes paths that are relative to the current working diectory, they will
+        // if the user passes paths that are relative to the current working directory, they will
         // be displayed as relative paths. Otherwise, they will still be displayed as absolute
         // paths.
         let relativePath =

Tests/SwiftFormatTests/PrettyPrint/AttributeTests.swift

@@ -26,6 +26,40 @@ final class AttributeTests: PrettyPrintTestCase {
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 60)
   }
 
+  func testAttributeParamSpacingInOriginallyDefinedIn() {
+    let input =
+      """
+      @_originallyDefinedIn( module  :"SwiftUI" , iOS 10.0  )
+      func f() {}
+      """
+
+    let expected =
+      """
+      @_originallyDefinedIn(module: "SwiftUI", iOS 10.0)
+      func f() {}
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 60)
+  }
+
+  func testAttributeParamSpacingInDocVisibility() {
+    let input =
+      """
+      @_documentation(  visibility   :private )
+      func f() {}
+      """
+
+    let expected =
+      """
+      @_documentation(visibility: private)
+      func f() {}
+
+      """
+
+    assertPrettyPrintEqual(input: input, expected: expected, linelength: 60)
+  }
+
   func testAttributeBinPackedWrapping() {
     let input =
       """

Tests/SwiftFormatTests/PrettyPrint/CommaTests.swift

@@ -105,7 +105,7 @@ final class CommaTests: PrettyPrintTestCase {
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 20, configuration: configuration)
   }
 
-  func testArraySingleLineCommasPresentDisabled() {
+  func testArraySingleLineCommasPresentEnabled() {
     let input =
       """
       let MyCollection = [1, 2, 3,]
@@ -124,7 +124,7 @@ final class CommaTests: PrettyPrintTestCase {
     assertPrettyPrintEqual(input: input, expected: expected, linelength: 40, configuration: configuration)
   }
 
-  func testArraySingleLineCommasPresentEnabled() {
+  func testArraySingleLineCommasPresentDisabled() {
     let input =
       """
       let MyCollection = [1, 2, 3,]