Manually fix swift-format lint rules

- I think there are valid calls with mixing inline and trailing closures (notably `Debouncer`), so I’m considering whether we should disable that rule.
- The `forEach` rule is a little annoying because we have `forEach` on `SKDResponseArray`. But it caught two cases of using `forEach` on arrays, so I think it’s worth keeping.

Author: ahoppen

Sources/BuildServerIntegration/BuildServerManager.swift

@@ -460,36 +460,38 @@ package actor BuildServerManager: QueueBasedMessageHandler {
     // The debounce duration of 500ms was chosen arbitrarily without any measurements.
     self.filesDependenciesUpdatedDebouncer = Debouncer(
       debounceDuration: .milliseconds(500),
-      combineResults: { $0.union($1) }
-    ) {
-      [weak self] (filesWithUpdatedDependencies) in
-      guard let self, let delegate = await self.delegate else {
-        logger.fault("Not calling filesDependenciesUpdated because no delegate exists in SwiftPMBuildServer")
-        return
-      }
-      let changedWatchedFiles = await self.watchedFilesReferencing(mainFiles: filesWithUpdatedDependencies)
-      if !changedWatchedFiles.isEmpty {
-        await delegate.filesDependenciesUpdated(changedWatchedFiles)
+      combineResults: { $0.union($1) },
+      makeCall: {
+        [weak self] (filesWithUpdatedDependencies) in
+        guard let self, let delegate = await self.delegate else {
+          logger.fault("Not calling filesDependenciesUpdated because no delegate exists in SwiftPMBuildServer")
+          return
+        }
+        let changedWatchedFiles = await self.watchedFilesReferencing(mainFiles: filesWithUpdatedDependencies)
+        if !changedWatchedFiles.isEmpty {
+          await delegate.filesDependenciesUpdated(changedWatchedFiles)
+        }
       }
-    }
+    )
 
     // We don't need a large debounce duration here. It just needs to be big enough to accumulate
     // `resultReceivedAfterTimeout` calls for the same document (see comment on `filesBuildSettingsChangedDebouncer`).
     // Since they should all come in at the same time, a couple of milliseconds should be sufficient here, an 20ms be
     // plenty while still not causing a noticeable delay to the user.
     self.filesBuildSettingsChangedDebouncer = Debouncer(
       debounceDuration: .milliseconds(20),
-      combineResults: { $0.union($1) }
-    ) {
-      [weak self] (filesWithChangedBuildSettings) in
-      guard let self, let delegate = await self.delegate else {
-        logger.fault("Not calling fileBuildSettingsChanged because no delegate exists in SwiftPMBuildServer")
-        return
-      }
-      if !filesWithChangedBuildSettings.isEmpty {
-        await delegate.fileBuildSettingsChanged(filesWithChangedBuildSettings)
+      combineResults: { $0.union($1) },
+      makeCall: {
+        [weak self] (filesWithChangedBuildSettings) in
+        guard let self, let delegate = await self.delegate else {
+          logger.fault("Not calling fileBuildSettingsChanged because no delegate exists in SwiftPMBuildServer")
+          return
+        }
+        if !filesWithChangedBuildSettings.isEmpty {
+          await delegate.fileBuildSettingsChanged(filesWithChangedBuildSettings)
+        }
       }
-    }
+    )
 
     // TODO: Forward file watch patterns from this initialize request to the client
     // (https://github.com/swiftlang/sourcekit-lsp/issues/1671)

Sources/BuildServerIntegration/CompilationDatabase.swift

@@ -140,7 +140,9 @@ package struct JSONCompilationDatabase: Equatable, Codable {
 
   package func encode(to encoder: Encoder) throws {
     var container = encoder.unkeyedContainer()
-    try commands.forEach { try container.encode($0) }
+    for command in commands {
+      try container.encode(command)
+    }
   }
 
   package subscript(_ uri: DocumentURI) -> [CompilationDatabaseCompileCommand] {

Sources/BuildServerProtocol/Messages/TaskStartNotification.swift

@@ -46,7 +46,7 @@ public struct TaskStartNotification: NotificationType {
   /// Message describing the task.
   public var message: String?
 
-  /** Kind of data to expect in the `data` field. If this field is not set, the kind of data is not specified. */
+  /// Kind of data to expect in the `data` field. If this field is not set, the kind of data is not specified.
   public var dataKind: TaskStartDataKind?
 
   /// Optional metadata about the task.

Sources/CompletionScoring/Text/MatchCollator.swift

@@ -415,15 +415,16 @@ package struct MatchCollator {
       influencingTokenizedIdentifiers: influencingTokenizedIdentifiers,
       patternUTF8Length: 0,
       orderingTiesBy: { _, _ in false },
-      maximumNumberOfItemsForExpensiveSelection: Self.defaultMaximumNumberOfItemsForExpensiveSelection
-    ) { collator in
-      return (0..<iterations).reduce(0) { accumulation, _ in
-        collator.applyInfluence()
-        return collator.rescoredMatches.reduce(accumulation) { accumulation, match in
-          accumulation + match.individualScore.value
+      maximumNumberOfItemsForExpensiveSelection: Self.defaultMaximumNumberOfItemsForExpensiveSelection,
+      body: { collator in
+        return (0..<iterations).reduce(0) { accumulation, _ in
+          collator.applyInfluence()
+          return collator.rescoredMatches.reduce(accumulation) { accumulation, match in
+            accumulation + match.individualScore.value
+          }
         }
       }
-    }
+    )
   }
 
   package static func tokenize(

Sources/SKUtilities/Debouncer.swift

@@ -41,7 +41,7 @@ package actor Debouncer<Parameter: Sendable> {
   package init(
     debounceDuration: Duration,
     combineResults: @escaping (Parameter, Parameter) -> Parameter,
-    _ makeCall: @Sendable @escaping (Parameter) async -> Void
+    makeCall: @Sendable @escaping (Parameter) async -> Void
   ) {
     self.debounceDuration = debounceDuration
     self.combineParameters = combineResults
@@ -84,7 +84,7 @@ package actor Debouncer<Parameter: Sendable> {
 
 extension Debouncer<Void> {
   package init(debounceDuration: Duration, _ makeCall: @Sendable @escaping () async -> Void) {
-    self.init(debounceDuration: debounceDuration, combineResults: { _, _ in }, makeCall)
+    self.init(debounceDuration: debounceDuration, combineResults: { _, _ in }, makeCall: makeCall)
   }
 
   package func scheduleCall() {

Sources/SourceKitD/SKDResponseArray.swift

@@ -62,6 +62,8 @@ package final class SKDResponseArray: Sendable {
   package func map<T>(_ transform: (SKDResponseDictionary) throws -> T) rethrows -> [T] {
     var result: [T] = []
     result.reserveCapacity(self.count)
+    // swift-format-ignore: ReplaceForEachWithForLoop
+    // Reference is to `SKDResponseArray.forEach`, not `Array.forEach`.
     try self.forEach { _, element in
       result.append(try transform(element))
       return true
@@ -71,6 +73,8 @@ package final class SKDResponseArray: Sendable {
 
   package func compactMap<T>(_ transform: (SKDResponseDictionary) throws -> T?) rethrows -> [T] {
     var result: [T] = []
+    // swift-format-ignore: ReplaceForEachWithForLoop
+    // Reference is to `SKDResponseArray.forEach`, not `Array.forEach`.
     try self.forEach { _, element in
       if let transformed = try transform(element) {
         result.append(transformed)

Sources/SourceKitD/sourcekitd_uids.swift

@@ -14,6 +14,8 @@
 
 package import Csourcekitd
 
+// swift-format-ignore: TypeNamesShouldBeCapitalized
+// Matching C style types
 package struct sourcekitd_api_keys {
   /// `key.version_major`
   package let versionMajor: sourcekitd_api_uid_t
@@ -776,6 +778,8 @@ package struct sourcekitd_api_keys {
   }
 }
 
+// swift-format-ignore: TypeNamesShouldBeCapitalized
+// Matching C style types
 package struct sourcekitd_api_requests {
   /// `source.request.protocol_version`
   package let protocolVersion: sourcekitd_api_uid_t
@@ -947,6 +951,8 @@ package struct sourcekitd_api_requests {
   }
 }
 
+// swift-format-ignore: TypeNamesShouldBeCapitalized
+// Matching C style types
 package struct sourcekitd_api_values {
   /// `source.lang.swift.decl.function.free`
   package let declFunctionFree: sourcekitd_api_uid_t

Sources/SourceKitLSP/Swift/CommentXML.swift

@@ -65,8 +65,11 @@ private struct XMLToMarkdown {
 
   // [XMLNode]? is the type of XMLNode.children.
   mutating func toMarkdown(_ nodes: [XMLNode]?, separator: String = "") {
-    nodes?.forEach {
-      toMarkdown($0)
+    guard let nodes else {
+      return
+    }
+    for node in nodes {
+      toMarkdown(node)
       out += separator
     }
   }

Sources/SourceKitLSP/Swift/Diagnostic.swift

@@ -26,6 +26,8 @@ extension CodeAction {
   /// If this is from a note, the note's description should be passed as `fromNote`.
   init?(fixits: SKDResponseArray, in snapshot: DocumentSnapshot, fromNote: String?) {
     var edits: [TextEdit] = []
+    // swift-format-ignore: ReplaceForEachWithForLoop
+    // Reference is to `SKDResponseArray.forEach`, not `Array.forEach`.
     let editsMapped = fixits.forEach { (_, skfixit) -> Bool in
       if let edit = TextEdit(fixit: skfixit, in: snapshot) {
         edits.append(edit)
@@ -204,6 +206,8 @@ extension Diagnostic {
       range = Range(snapshot.positionOf(utf8Offset: utf8Offset))
     }
 
+    // swift-format-ignore: ReplaceForEachWithForLoop
+    // Reference is to `SKDResponseArray.forEach`, not `Array.forEach`.
     // If the diagnostic has a range associated with it that starts at the same location as the diagnostics position, use it to retrieve a proper range for the diagnostic, instead of just reporting a zero-length range.
     (diag[keys.ranges] as SKDResponseArray?)?.forEach { index, skRange in
       guard let utf8Offset: Int = skRange[keys.offset],
@@ -273,6 +277,8 @@ extension Diagnostic {
     var notes: [DiagnosticRelatedInformation]? = nil
     if let sknotes: SKDResponseArray = diag[keys.diagnostics] {
       notes = []
+      // swift-format-ignore: ReplaceForEachWithForLoop
+      // Reference is to `SKDResponseArray.forEach`, not `Array.forEach`.
       sknotes.forEach { (_, sknote) -> Bool in
         guard
           let note = DiagnosticRelatedInformation(

Sources/SourceKitLSP/Swift/RefactoringResponse.swift

@@ -29,11 +29,15 @@ extension [RefactoringEdit] {
 
     self = []
 
+    // swift-format-ignore: ReplaceForEachWithForLoop
+    // Reference is to `SKDResponseArray.forEach`, not `Array.forEach`.
     categorizedEdits.forEach { _, categorizedEdit in
       guard let edits: SKDResponseArray = categorizedEdit[keys.edits] else {
         logger.fault("edits doesn't exist in categorizedEdit dictionary")
         return true
       }
+      // swift-format-ignore: ReplaceForEachWithForLoop
+      // Reference is to `SKDResponseArray.forEach`, not `Array.forEach`.
       edits.forEach { _, edit in
         guard let startLine: Int = edit[keys.line],
           let startColumn: Int = edit[keys.column],