Format sources with swift-format

Author: ahoppen

Sources/LSPLogging/NonDarwinLogging.swift

@@ -18,7 +18,8 @@ public enum LogConfig {
   /// The globally set log level
   fileprivate static let logLevel: NonDarwinLogLevel = {
     if let envVar = ProcessInfo.processInfo.environment["SOURCEKITLSP_LOG_LEVEL"],
-      let logLevel = NonDarwinLogLevel(envVar) {
+      let logLevel = NonDarwinLogLevel(envVar)
+    {
       return logLevel
     }
     #if DEBUG

Sources/LanguageServerProtocol/SupportTypes/WorkspaceSettings.swift

@@ -59,8 +59,8 @@ public struct ClangWorkspaceSettings: Codable, Hashable {
 
   var isValid: Bool {
     switch (compilationDatabasePath, compilationDatabaseChanges) {
-      case (nil, .some), (.some, nil): return true
-      default: return false
+    case (nil, .some), (.some, nil): return true
+    default: return false
     }
   }
 }

Sources/SKCore/CompilationDatabaseBuildSystem.swift

@@ -73,7 +73,11 @@ public actor CompilationDatabaseBuildSystem {
     return nil
   }
 
-  public init?(projectRoot: AbsolutePath? = nil, searchPaths: [RelativePath], fileSystem: FileSystem = localFileSystem) {
+  public init?(
+    projectRoot: AbsolutePath? = nil,
+    searchPaths: [RelativePath],
+    fileSystem: FileSystem = localFileSystem
+  ) {
     self.fileSystem = fileSystem
     self.projectRoot = projectRoot
     self.searchPaths = searchPaths

Sources/SKCore/FileBuildSettings.swift

@@ -78,6 +78,10 @@ public extension FileBuildSettings {
         arguments.insert("-xobjective-c++", at: 0)
       }
     }
-    return FileBuildSettings(compilerArguments: arguments, workingDirectory: self.workingDirectory, isFallback: self.isFallback)
+    return FileBuildSettings(
+      compilerArguments: arguments,
+      workingDirectory: self.workingDirectory,
+      isFallback: self.isFallback
+    )
   }
 }

Sources/SKSupport/AsyncUtils.swift

@@ -48,17 +48,20 @@ public func withCancellableCheckedThrowingContinuation<Handle, Result>(
     }
   }
 
-  return try await withTaskCancellationHandler(operation: {
-    try Task.checkCancellation()
-    return try await withCheckedThrowingContinuation { continuation in
-      handleWrapper.value = operation(continuation)
+  return try await withTaskCancellationHandler(
+    operation: {
+      try Task.checkCancellation()
+      return try await withCheckedThrowingContinuation { continuation in
+        handleWrapper.value = operation(continuation)
 
-      // Check if the task was cancelled. This ensures we send a
-      // CancelNotification even if the task gets cancelled after we register
-      // the cancellation handler but before we set the `requestID`.
-      if Task.isCancelled {
-        callCancel()
+        // Check if the task was cancelled. This ensures we send a
+        // CancelNotification even if the task gets cancelled after we register
+        // the cancellation handler but before we set the `requestID`.
+        if Task.isCancelled {
+          callCancel()
+        }
       }
-    }
-  }, onCancel: callCancel)
+    },
+    onCancel: callCancel
+  )
 }

Sources/SKTestSupport/IndexedSingleSwiftFileWorkspace.swift

@@ -57,7 +57,7 @@ public struct IndexedSingleSwiftFileWorkspace {
     var compilerArguments: [String] = [
       testFileURL.path,
       "-index-store-path", indexURL.path,
-      "-typecheck"
+      "-typecheck",
     ]
     if !indexSystemModules {
       compilerArguments.append("-index-ignore-system-modules")

Sources/SourceKitD/sourcekitd_uids.swift

@@ -345,8 +345,12 @@ public struct sourcekitd_values {
     ref_function_accessor_didset = api.uid_get_from_cstr("source.lang.swift.ref.function.accessor.didset")!
     decl_function_accessor_address = api.uid_get_from_cstr("source.lang.swift.decl.function.accessor.address")!
     ref_function_accessor_address = api.uid_get_from_cstr("source.lang.swift.ref.function.accessor.address")!
-    decl_function_accessor_mutableaddress = api.uid_get_from_cstr("source.lang.swift.decl.function.accessor.mutableaddress")!
-    ref_function_accessor_mutableaddress = api.uid_get_from_cstr("source.lang.swift.ref.function.accessor.mutableaddress")!
+    decl_function_accessor_mutableaddress = api.uid_get_from_cstr(
+      "source.lang.swift.decl.function.accessor.mutableaddress"
+    )!
+    ref_function_accessor_mutableaddress = api.uid_get_from_cstr(
+      "source.lang.swift.ref.function.accessor.mutableaddress"
+    )!
     decl_function_accessor_read = api.uid_get_from_cstr("source.lang.swift.decl.function.accessor.read")!
     ref_function_accessor_read = api.uid_get_from_cstr("source.lang.swift.ref.function.accessor.read")!
     decl_function_accessor_modify = api.uid_get_from_cstr("source.lang.swift.decl.function.accessor.modify")!
@@ -412,7 +416,9 @@ public struct sourcekitd_values {
     syntaxtype_operator = api.uid_get_from_cstr("source.lang.swift.syntaxtype.operator")!
     syntaxtype_number = api.uid_get_from_cstr("source.lang.swift.syntaxtype.number")!
     syntaxtype_string = api.uid_get_from_cstr("source.lang.swift.syntaxtype.string")!
-    syntaxtype_string_interpolation_anchor = api.uid_get_from_cstr("source.lang.swift.syntaxtype.string_interpolation_anchor")!
+    syntaxtype_string_interpolation_anchor = api.uid_get_from_cstr(
+      "source.lang.swift.syntaxtype.string_interpolation_anchor"
+    )!
     syntaxtype_type_identifier = api.uid_get_from_cstr("source.lang.swift.syntaxtype.typeidentifier")!
     syntaxtype_identifier = api.uid_get_from_cstr("source.lang.swift.syntaxtype.identifier")!
     expr_object_literal = api.uid_get_from_cstr("source.lang.swift.expr.object_literal")!

Sources/SourceKitLSP/Clang/ClangLanguageServer.swift

@@ -40,10 +40,10 @@ fileprivate class ClangdStderrLogForwarder {
     self.buffer += newData
     while let newlineIndex = self.buffer.firstIndex(of: UInt8(ascii: "\n")) {
       // Output a separate log message for every line in clangd's stderr.
-      // The reason why we don't output multiple lines in a single log message is that 
+      // The reason why we don't output multiple lines in a single log message is that
       //  a) os_log truncates log messages at about 1000 bytes. The assumption is that a single line is usually less
       //     than 1000 bytes long but if we merge multiple lines into one message, we might easily exceed this limit.
-      //  b) It might be confusing why sometimes a single log message contains one line while sometimes it contains 
+      //  b) It might be confusing why sometimes a single log message contains one line while sometimes it contains
       //     multiple.
       let logger = Logger(subsystem: subsystem, category: "clangd-stderr")
       logger.info("\(String(data: self.buffer[...newlineIndex], encoding: .utf8) ?? "<invalid UTF-8>")")

Sources/SourceKitLSP/Swift/CodeCompletion.swift

@@ -43,7 +43,8 @@ extension SwiftLanguageServer {
 
     let filterText = String(snapshot.text[start..<end])
 
-    let clientSupportsSnippets = capabilityRegistry.clientCapabilities.textDocument?.completion?.completionItem?.snippetSupport ?? false
+    let clientSupportsSnippets =
+      capabilityRegistry.clientCapabilities.textDocument?.completion?.completionItem?.snippetSupport ?? false
     let buildSettings = await buildSettings(for: snapshot.uri)
     return try await CodeCompletionSession.completionList(
       sourcekitd: sourcekitd,
@@ -59,7 +60,7 @@ extension SwiftLanguageServer {
     )
   }
 
-   /// Adjust completion position to the start of identifier characters.
+  /// Adjust completion position to the start of identifier characters.
   private func adjustCompletionLocation(_ pos: Position, in snapshot: DocumentSnapshot) -> Position? {
     guard pos.line < snapshot.lineTable.count else {
       // Line out of range.

Sources/SourceKitLSP/Swift/CodeCompletionSession.swift

@@ -51,7 +51,7 @@ class CodeCompletionSession {
   /// Modification of code completion sessions should only happen on
   /// `completionQueue`.
   private static var completionSessions: [ObjectIdentifier: CodeCompletionSession] = [:]
-  
+
   /// Gets the code completion results for the given parameters.
   ///
   /// If a code completion session that is compatible with the parameters
@@ -98,16 +98,20 @@ class CodeCompletionSession {
   ) async throws -> CompletionList {
     let task = completionQueue.asyncThrowing {
       if let session = completionSessions[ObjectIdentifier(sourcekitd)], session.state == .open {
-        let isCompatible = session.snapshot.uri == snapshot.uri &&
-        session.utf8StartOffset == completionUtf8Offset &&
-        session.position == completionPosition &&
-        session.compileCommand == compileCommand &&
-        session.clientSupportsSnippets == clientSupportsSnippets
+        let isCompatible =
+          session.snapshot.uri == snapshot.uri && session.utf8StartOffset == completionUtf8Offset
+          && session.position == completionPosition && session.compileCommand == compileCommand
+          && session.clientSupportsSnippets == clientSupportsSnippets
 
         if isCompatible {
-          return try await session.update(filterText: filterText, position: cursorPosition, in: snapshot, options: options)
+          return try await session.update(
+            filterText: filterText,
+            position: cursorPosition,
+            in: snapshot,
+            options: options
+          )
         }
-        
+
         if mustReuse {
           logger.error(
             """

Sources/SourceKitLSP/Swift/DocumentSymbols.swift

@@ -10,9 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+import LSPLogging
 import LanguageServerProtocol
 import SwiftSyntax
-import LSPLogging
 
 extension SwiftLanguageServer {
   public func documentSymbol(_ req: DocumentSymbolRequest) async throws -> DocumentSymbolResponse? {
@@ -82,19 +82,20 @@ fileprivate final class DocumentSymbolsFinder: SyntaxAnyVisitor {
     guard let node = node.asProtocol(NamedDeclSyntax.self) else {
       return .visitChildren
     }
-    let symbolKind: SymbolKind? = switch node.kind {
-    case .actorDecl: .class
-    case .associatedTypeDecl: .typeParameter
-    case .classDecl: .class
-    case .enumDecl: .enum
-    case .macroDecl: .function // LSP doesn't have a macro symbol kind. Function is the closest.
-    case .operatorDecl: .operator
-    case .precedenceGroupDecl: .operator // LSP doesn't have a precedence group symbol kind. Operator is the closest.
-    case .protocolDecl: .interface
-    case .structDecl: .struct
-    case .typeAliasDecl: .typeParameter // LSP doesn't have a typealias symbol kind. Type parameter is the closest.
-    default: nil
-    }
+    let symbolKind: SymbolKind? =
+      switch node.kind {
+      case .actorDecl: .class
+      case .associatedTypeDecl: .typeParameter
+      case .classDecl: .class
+      case .enumDecl: .enum
+      case .macroDecl: .function  // LSP doesn't have a macro symbol kind. `function`` is closest.
+      case .operatorDecl: .operator
+      case .precedenceGroupDecl: .operator  // LSP doesn't have a precedence group symbol kind. `operator` is closest.
+      case .protocolDecl: .interface
+      case .structDecl: .struct
+      case .typeAliasDecl: .typeParameter  // LSP doesn't have a typealias symbol kind. `typeParameter` is closest.
+      default: nil
+      }
 
     guard let symbolKind else {
       return .visitChildren
@@ -136,13 +137,14 @@ fileprivate final class DocumentSymbolsFinder: SyntaxAnyVisitor {
   }
 
   override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
-    let kind: SymbolKind = if node.name.tokenKind.isOperator {
-      .operator
-    } else if node.parent?.is(MemberBlockItemSyntax.self) ?? false {
-      .method
-    } else {
-      .function
-    }
+    let kind: SymbolKind =
+      if node.name.tokenKind.isOperator {
+        .operator
+      } else if node.parent?.is(MemberBlockItemSyntax.self) ?? false {
+        .method
+      } else {
+        .function
+      }
     return record(
       node: node,
       name: node.declName,
@@ -181,7 +183,7 @@ fileprivate final class DocumentSymbolsFinder: SyntaxAnyVisitor {
     guard let variableDecl = node.parent?.parent?.as(VariableDeclSyntax.self) else {
       return .visitChildren
     }
-    let rangeNode: Syntax = variableDecl.bindings.count == 1  ? Syntax(variableDecl) : Syntax(node)
+    let rangeNode: Syntax = variableDecl.bindings.count == 1 ? Syntax(variableDecl) : Syntax(node)
 
     return record(
       node: node,

Sources/SourceKitLSP/Swift/SemanticTokens.swift

@@ -52,7 +52,9 @@ extension SwiftLanguageServer {
     in range: Range<Position>? = nil
   ) async -> [SyntaxHighlightingToken] {
     async let tree = syntaxTreeManager.syntaxTree(for: snapshot)
-    async let semanticTokens = await orLog("Loading semantic tokens") { try await semanticHighlightingTokens(for: snapshot) }
+    async let semanticTokens = await orLog("Loading semantic tokens") {
+      try await semanticHighlightingTokens(for: snapshot)
+    }
 
     let range =
       if let range = range.flatMap({ $0.byteSourceRange(in: snapshot) }) {

Tests/SKCoreTests/BuildSystemManagerTests.swift

@@ -58,7 +58,7 @@ final class BuildSystemManagerTests: XCTestCase {
 
     await mainFiles.updateMainFiles(for: a, to: [a])
     await mainFiles.updateMainFiles(for: b, to: [c, d, a])
-  
+
     await assertEqual(bsm._cachedMainFile(for: a), c)
     await assertEqual(bsm._cachedMainFile(for: b), bMain)
     await assertEqual(bsm._cachedMainFile(for: c), c)
@@ -236,7 +236,7 @@ final class BuildSystemManagerTests: XCTestCase {
     let cpp2 = DocumentURI(string: "bsm:other.cpp")
     let mainFiles = ManualMainFilesProvider(
       [
-      h: [cpp1],
+        h: [cpp1],
         cpp1: [cpp1],
         cpp2: [cpp2],
       ]
@@ -411,7 +411,7 @@ private final actor ManualMainFilesProvider: MainFilesProvider {
     self.mainFiles = mainFiles
   }
 
-  func updateMainFiles(for file: DocumentURI, to mainFiles: Set<DocumentURI>)async {
+  func updateMainFiles(for file: DocumentURI, to mainFiles: Set<DocumentURI>) async {
     self.mainFiles[file] = mainFiles
   }
 

Tests/SourceKitDTests/CrashRecoveryTests.swift

@@ -51,11 +51,14 @@ final class CrashRecoveryTests: XCTestCase {
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI.for(.swift)
 
-    let positions = testClient.openDocument("""
+    let positions = testClient.openDocument(
+      """
       func 1️⃣foo() {
         print("Hello world")
       }
-      """, uri: uri)
+      """,
+      uri: uri
+    )
 
     // Wait for diagnostics to be produced to make sure the document open got handled by sourcekitd.
     _ = try await testClient.nextDiagnosticsNotification()

Tests/SourceKitDTests/SourceKitDTests.swift

@@ -14,13 +14,13 @@ import Foundation
 import ISDBTestSupport
 import ISDBTibs
 import LSPTestSupport
+import LanguageServerProtocol
 import SKCore
 import SKSupport
+import SKTestSupport
 import SourceKitD
 import TSCBasic
 import XCTest
-import LanguageServerProtocol
-import SKTestSupport
 
 import enum PackageLoading.Platform
 import class TSCBasic.Process

Tests/SourceKitLSPTests/DocumentSymbolTests.swift

@@ -318,7 +318,7 @@ final class DocumentSymbolTests: XCTestCase {
           range: positions["4️⃣"]..<positions["6️⃣"],
           selectionRange: positions["4️⃣"]..<positions["5️⃣"],
           children: []
-        )
+        ),
       ]
     }
   }

Tests/SourceKitLSPTests/LocalSwiftTests.swift

@@ -1503,7 +1503,9 @@ final class LocalSwiftTests: XCTestCase {
   }
 
   func testEditorPlaceholderParsing() {
-    var text = "<#basic placeholder" + "#>"  // Need to end this in another line so Xcode doesn't treat it as a real placeholder
+    var text =
+      "<#basic placeholder"  // Need to end this in another line so Xcode doesn't treat it as a real placeholder
+      + "#>"
     var data = EditorPlaceholder(text)
     XCTAssertNotNil(data)
     if let data = data {

Tests/SourceKitLSPTests/SourceKitTests.swift

@@ -183,7 +183,9 @@ final class SKTests: XCTestCase {
 
     let workspaceDirectory = try testScratchDir()
 
-    guard let versionedPath = try await checkRunningIndex(cleanUp: false, workspaceDirectory: workspaceDirectory) else { return }
+    guard let versionedPath = try await checkRunningIndex(cleanUp: false, workspaceDirectory: workspaceDirectory) else {
+      return
+    }
 
     let versionContentsAfter = try listdir(versionedPath)
     XCTAssertEqual(versionContentsAfter.count, 1)