Move ClangLanguageService to its own module

Author: ahoppen

Package.swift

@@ -127,6 +127,27 @@ var targets: [Target] = [
     dependencies: []
   ),
 
+  // MARK: ClangLanguageService
+
+  .target(
+    name: "ClangLanguageService",
+    dependencies: [
+      "BuildServerIntegration",
+      "DocCDocumentation",
+      "LanguageServerProtocol",
+      "LanguageServerProtocolExtensions",
+      "LanguageServerProtocolJSONRPC",
+      "SKLogging",
+      "SKOptions",
+      "SourceKitLSP",
+      "SwiftExtensions",
+      "ToolchainRegistry",
+      "TSCExtensions",
+    ] + swiftSyntaxDependencies(["SwiftSyntax"]),
+    exclude: ["CMakeLists.txt"],
+    swiftSettings: globalSwiftSettings
+  ),
+
   // MARK: CompletionScoring
 
   .target(
@@ -241,6 +262,7 @@ var targets: [Target] = [
     name: "InProcessClient",
     dependencies: [
       "BuildServerIntegration",
+      "ClangLanguageService",
       "LanguageServerProtocol",
       "SKLogging",
       "SKOptions",

Sources/CMakeLists.txt

@@ -5,6 +5,7 @@ add_subdirectory(BuildServerProtocol)
 add_subdirectory(BuildServerIntegration)
 add_subdirectory(CAtomics)
 add_subdirectory(CCompletionScoring)
+add_subdirectory(ClangLanguageService)
 add_subdirectory(CompletionScoring)
 add_subdirectory(Csourcekitd)
 add_subdirectory(Diagnose)

Sources/ClangLanguageService/CMakeLists.txt

@@ -0,0 +1,25 @@
+add_library(ClangLanguageService STATIC
+  ClangLanguageService.swift
+  SemanticTokenTranslator.swift
+)
+
+set_target_properties(ClangLanguageService PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}
+)
+
+target_link_libraries(ClangLanguageService PUBLIC
+  LanguageServerProtocol
+  SKOptions
+  SourceKitLSP
+  SwiftExtensions
+  ToolchainRegistry
+  SwiftSyntax::SwiftSyntax
+)
+
+target_link_libraries(ClangLanguageService PRIVATE
+  BuildServerIntegration
+  LanguageServerProtocolExtensions
+  LanguageServerProtocolJSONRPC
+  SKLogging
+  TSCExtensions
+)

Sources/SourceKitLSP/Clang/ClangLanguageService.swift renamed to Sources/ClangLanguageService/ClangLanguageService.swift

@@ -17,6 +17,7 @@ import LanguageServerProtocolExtensions
 import LanguageServerProtocolJSONRPC
 import SKLogging
 package import SKOptions
+package import SourceKitLSP
 package import SwiftExtensions
 package import SwiftSyntax
 import TSCExtensions
@@ -499,7 +500,7 @@ extension ClangLanguageService {
       throw ResponseError.unknown("Connection to the editor closed")
     }
 
-    let snapshot = try sourceKitLSPServer.documentManager.latestSnapshot(req.textDocument.uri)
+    let snapshot = try await sourceKitLSPServer.documentManager.latestSnapshot(req.textDocument.uri)
     throw ResponseError.requestFailed(doccDocumentationError: .unsupportedLanguage(snapshot.language))
   }
   #endif

Sources/SourceKitLSP/Clang/SemanticTokenTranslator.swift renamed to Sources/ClangLanguageService/SemanticTokenTranslator.swift

@@ -7,6 +7,7 @@ set_target_properties(InProcessClient PROPERTIES
 
 target_link_libraries(InProcessClient PUBLIC
   BuildServerIntegration
+  ClangLanguageService
   LanguageServerProtocol
   SKLogging
   SKOptions

Sources/InProcessClient/CMakeLists.txt

@@ -1,3 +1,16 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import ClangLanguageService
 import LanguageServerProtocol
 package import SourceKitLSP
 

Sources/InProcessClient/LanguageServiceRegistry+staticallyKnownServices.swift

@@ -3,6 +3,7 @@ add_library(SourceKitLSP STATIC
   CapabilityRegistry.swift
   DocumentManager.swift
   DocumentSnapshot+FromFileContents.swift
+  DocumentSnapshot+PositionConversions.swift
   Hooks.swift
   IndexProgressManager.swift
   IndexStoreDB+MainFilesProvider.swift
@@ -21,10 +22,6 @@ add_library(SourceKitLSP STATIC
   TextEdit+IsNoop.swift
   Workspace.swift
 )
-target_sources(SourceKitLSP PRIVATE
-  Clang/ClangLanguageService.swift
-  Clang/SemanticTokenTranslator.swift
-)
 target_sources(SourceKitLSP PRIVATE
   Documentation/DocCDocumentationHandler.swift
   Documentation/DocumentationLanguageService.swift