Merge pull request #2231 from ahoppen/exhaustive-swift-format

Apply exhaustive swift-format configuration from swift-syntax

Author: ahoppen

.swift-format

@@ -1,20 +1,76 @@
 {
-    "version": 1,
-    "lineLength": 120,
+    "fileScopedDeclarationPrivacy": {
+        "accessLevel": "private"
+    },
+    "indentConditionalCompilationBlocks": false,
+    "indentSwitchCaseLabels": false,
     "indentation": {
         "spaces": 2
     },
+    "lineBreakAroundMultilineExpressionChainComponents": false,
+    "lineBreakBeforeControlFlowKeywords": false,
     "lineBreakBeforeEachArgument": true,
-    "indentConditionalCompilationBlocks": false,
+    "lineBreakBeforeEachGenericRequirement": false,
+    "lineBreakBetweenDeclarationAttributes": false,
+    "lineLength": 120,
+    "maximumBlankLines": 1,
+    "multiElementCollectionTrailingCommas": true,
+    "noAssignmentInExpressions": {
+        "allowedFunctions": [
+            "XCTAssertNoThrow"
+        ]
+    },
     "prioritizeKeepingFunctionOutputTogether": true,
+    "reflowMultilineStringLiterals": {
+        "never": {
+
+        }
+    },
+    "respectsExistingLineBreaks": true,
     "rules": {
+        "AllPublicDeclarationsHaveDocumentation": false,
+        "AlwaysUseLiteralForEmptyCollectionInit": false,
         "AlwaysUseLowerCamelCase": false,
         "AmbiguousTrailingClosureOverload": false,
+        "BeginDocumentationCommentWithOneLineSummary": false,
+        "DoNotUseSemicolons": false,
+        "DontRepeatTypeInStaticProperties": false,
+        "FileScopedDeclarationPrivacy": true,
+        "FullyIndirectEnum": true,
+        "GroupNumericLiterals": true,
+        "IdentifiersMustBeASCII": true,
+        "NeverForceUnwrap": false,
+        "NeverUseForceTry": false,
+        "NeverUseImplicitlyUnwrappedOptionals": false,
+        "NoAccessLevelOnExtensionDeclaration": false,
+        "NoAssignmentInExpressions": true,
         "NoBlockComments": false,
+        "NoCasesWithOnlyFallthrough": true,
+        "NoEmptyTrailingClosureParentheses": true,
+        "NoLabelsInCasePatterns": true,
+        "NoLeadingUnderscores": false,
+        "NoParensAroundConditions": true,
+        "NoPlaygroundLiterals": true,
+        "NoVoidReturnOnFunctionSignature": true,
+        "OmitExplicitReturns": false,
+        "OneCasePerLine": true,
+        "OneVariableDeclarationPerLine": true,
+        "OnlyOneTrailingClosureArgument": true,
         "OrderedImports": true,
+        "ReplaceForEachWithForLoop": true,
+        "ReturnVoidInsteadOfEmptyTuple": true,
+        "TypeNamesShouldBeCapitalized": true,
+        "UseEarlyExits": false,
+        "UseExplicitNilCheckInConditions": true,
         "UseLetInEveryBoundCaseVariable": false,
+        "UseShorthandTypeNames": true,
+        "UseSingleLinePropertyGetter": true,
         "UseSynthesizedInitializer": false,
-        "ReturnVoidInsteadOfEmptyTuple": true,
-        "NoVoidReturnOnFunctionSignature": true,
-    }
+        "UseTripleSlashForDocumentationComments": true,
+        "UseWhereClausesInForLoops": false,
+        "ValidateDocumentationComments": false
+    },
+    "spacesAroundRangeFormationOperators": false,
+    "spacesBeforeEndOfLineComments": 2,
+    "version": 1,
 }

SourceKitLSPDevUtils/Sources/ConfigSchemaGen/JSONSchema.swift

@@ -101,10 +101,10 @@ struct JSONSchemaBuilder {
     case .integer: schema.type = "integer"
     case .number: schema.type = "number"
     case .string: schema.type = "string"
-    case .array(value: let value):
+    case .array(let value):
       schema.type = "array"
       schema.items = try buildJSONSchema(from: value)
-    case .dictionary(value: let value):
+    case .dictionary(let value):
       schema.type = "object"
       schema.additionalProperties = try buildJSONSchema(from: value)
     case .struct(let structInfo):

Sources/BuildServerIntegration/BuildServerManager.swift

@@ -24,7 +24,7 @@ package import ToolchainRegistry
 
 import struct TSCBasic.RelativePath
 
-fileprivate typealias RequestCache<Request: RequestType & Hashable> = Cache<Request, Request.Response>
+private typealias RequestCache<Request: RequestType & Hashable> = Cache<Request, Request.Response>
 
 /// An output path returned from the build server in the `SourceItem.data.outputPath` field.
 package enum OutputPath: Hashable, Comparable, CustomLogStringConvertible {
@@ -462,36 +462,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)
@@ -1629,7 +1631,7 @@ fileprivate extension TextDocumentSourceKitOptionsResponse {
   }
 }
 
-fileprivate let supplementalClangIndexingArgs: [String] = [
+private let supplementalClangIndexingArgs: [String] = [
   // Retain extra information for indexing
   "-fretain-comments-from-system-headers",
   // Pick up macro definitions during indexing

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/BuildServerIntegration/CompilerCommandLineOption.swift

@@ -151,7 +151,7 @@ package struct CompilerCommandLineOption {
   }
 }
 
-extension Array<CompilerCommandLineOption> {
+extension [CompilerCommandLineOption] {
   func firstMatch(for argument: String) -> CompilerCommandLineOption.Match? {
     for optionToRemove in self {
       if let match = optionToRemove.matches(argument: argument) {

Sources/BuildServerIntegration/SplitShellCommand.swift

@@ -12,7 +12,7 @@
 
 // MARK: - Unix
 
-fileprivate struct UnixCommandParser {
+private struct UnixCommandParser {
   var content: Substring
   var i: Substring.UTF8View.Index
   var result: [String] = []
@@ -162,7 +162,7 @@ fileprivate extension Character {
   }
 }
 
-fileprivate struct WindowsCommandParser {
+private struct WindowsCommandParser {
   /// The content of the entire command that shall be parsed.
   private let content: String
 

Sources/BuildServerIntegration/SwiftPMBuildServer.swift

@@ -36,7 +36,7 @@ import struct TSCBasic.AbsolutePath
 import class TSCBasic.Process
 package import class ToolchainRegistry.Toolchain
 
-fileprivate typealias AbsolutePath = Basics.AbsolutePath
+private typealias AbsolutePath = Basics.AbsolutePath
 
 /// A build target in SwiftPM
 package typealias SwiftBuildTarget = SourceKitLSPAPI.BuildTarget
@@ -78,7 +78,7 @@ fileprivate extension TSCBasic.AbsolutePath {
   }
 }
 
-fileprivate let preparationTaskID: AtomicUInt32 = AtomicUInt32(initialValue: 0)
+private let preparationTaskID: AtomicUInt32 = AtomicUInt32(initialValue: 0)
 
 /// Swift Package Manager build server and workspace support.
 ///
@@ -779,7 +779,7 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {
     switch exitStatus {
     case .terminated(code: 0):
       break
-    case .terminated(code: let code):
+    case .terminated(let code):
       // This most likely happens if there are compilation errors in the source file. This is nothing to worry about.
       let stdout = (try? String(bytes: result.output.get(), encoding: .utf8)) ?? "<no stderr>"
       let stderr = (try? String(bytes: result.stderrOutput.get(), encoding: .utf8)) ?? "<no stderr>"
@@ -792,14 +792,14 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {
         \(stdout)
         """
       )
-    case .signalled(signal: let signal):
+    case .signalled(let signal):
       if !Task.isCancelled {
         // The indexing job finished with a signal. Could be because the compiler crashed.
         // Ignore signal exit codes if this task has been cancelled because the compiler exits with SIGINT if it gets
         // interrupted.
         logger.error("Preparation of target \(target.forLogging) signaled \(signal)")
       }
-    case .abnormal(exception: let exception):
+    case .abnormal(let exception):
       if !Task.isCancelled {
         logger.error("Preparation of target \(target.forLogging) exited abnormally \(exception)")
       }

Sources/BuildServerProtocol/Messages.swift

@@ -12,7 +12,7 @@
 
 public import LanguageServerProtocol
 
-fileprivate let requestTypes: [_RequestType.Type] = [
+private let requestTypes: [_RequestType.Type] = [
   BuildShutdownRequest.self,
   BuildTargetPrepareRequest.self,
   BuildTargetSourcesRequest.self,
@@ -24,7 +24,7 @@ fileprivate let requestTypes: [_RequestType.Type] = [
   WorkspaceWaitForBuildSystemUpdatesRequest.self,
 ]
 
-fileprivate let notificationTypes: [NotificationType.Type] = [
+private let notificationTypes: [NotificationType.Type] = [
   CancelRequestNotification.self,
   FileOptionsChangedNotification.self,
   OnBuildExitNotification.self,

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/Semantics/Components/PopularityTable.swift

@@ -138,7 +138,7 @@ package struct PopularityTable {
   }
 }
 
-extension Dictionary<String, Popularity> {
+extension [String: Popularity] {
   fileprivate mutating func record(scoreComponent: Double, for key: String) {
     let leastPopular = Popularity(scoreComponent: -Double.infinity)
     if self[key, default: leastPopular].scoreComponent < scoreComponent {