Merge pull request swiftlang#286 from benlangmuir/product

Expose SourceKitLSP library product

Author: benlangmuir

Package.swift

@@ -9,6 +9,11 @@ let package = Package(
         name: "sourcekit-lsp",
         targets: ["sourcekit-lsp"]
       ),
+      .library(
+        name: "_SourceKitLSP",
+        type: .dynamic,
+        targets: ["SourceKitLSP"]
+      ),
       .library(
         name: "LSPBindings",
         type: .static,
@@ -26,13 +31,13 @@ let package = Package(
         name: "sourcekit-lsp",
         dependencies: [
           "LanguageServerProtocolJSONRPC",
-          "SourceKit",
+          "SourceKitLSP",
           "SwiftToolsSupport-auto",
         ]
       ),
 
       .target(
-        name: "SourceKit",
+        name: "SourceKitLSP",
         dependencies: [
           "BuildServerProtocol",
           "IndexStoreDB",
@@ -54,16 +59,16 @@ let package = Package(
           "CSKTestSupport",
           "ISDBTestSupport",
           "LSPTestSupport",
-          "SourceKit",
+          "SourceKitLSP",
           "tibs", // Never imported, needed at runtime
           "SwiftToolsSupport-auto",
         ]
       ),
       .testTarget(
-        name: "SourceKitTests",
+        name: "SourceKitLSPTests",
         dependencies: [
           "SKTestSupport",
-          "SourceKit",
+          "SourceKitLSP",
         ]
       ),
 

Sources/CMakeLists.txt

@@ -6,6 +6,6 @@ add_subdirectory(LSPLogging)
 add_subdirectory(SKCore)
 add_subdirectory(SKSupport)
 add_subdirectory(SKSwiftPMWorkspace)
-add_subdirectory(SourceKit)
+add_subdirectory(SourceKitLSP)
 add_subdirectory(SourceKitD)
 add_subdirectory(sourcekit-lsp)

Sources/SKTestSupport/SKSwiftPMTestWorkspace.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SourceKit
+import SourceKitLSP
 import SKSwiftPMWorkspace
 import LanguageServerProtocol
 import SKCore

Sources/SKTestSupport/SKTibsTestWorkspace.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SourceKit
+import SourceKitLSP
 import LanguageServerProtocol
 import SKCore
 import IndexStoreDB

Sources/SKTestSupport/TestServer.swift

@@ -15,7 +15,7 @@ import SKCore
 import TSCUtility
 import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
-import SourceKit
+import SourceKitLSP
 import class Foundation.Pipe
 import LSPTestSupport
 

Sources/SourceKit/CMakeLists.txt renamed to Sources/SourceKitLSP/CMakeLists.txt

@@ -5,7 +5,7 @@ if(CMAKE_VERSION VERSION_LESS 3.16)
   endif()
 endif()
 
-add_library(SourceKit
+add_library(SourceKitLSP
   DocumentManager.swift
   IndexStoreDB+MainFilesProvider.swift
   SourceKitIndexDelegate.swift
@@ -14,9 +14,9 @@ add_library(SourceKit
   SourceKitServer.swift
   ToolchainLanguageServer.swift
   Workspace.swift)
-target_sources(SourceKit PRIVATE
+target_sources(SourceKitLSP PRIVATE
   Clang/ClangLanguageServer.swift)
-target_sources(SourceKit PRIVATE
+target_sources(SourceKitLSP PRIVATE
   Swift/CommentXML.swift
   Swift/CursorInfo.swift
   Swift/Diagnostic.swift
@@ -26,10 +26,10 @@ target_sources(SourceKit PRIVATE
   Swift/SourceKitD+ResponseError.swift
   Swift/SwiftCommand.swift
   Swift/SwiftLanguageServer.swift)
-set_target_properties(SourceKit PROPERTIES
+set_target_properties(SourceKitLSP PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 # TODO(compnerd) reduce the exposure here, why is everything PUBLIC-ly linked?
-target_link_libraries(SourceKit PUBLIC
+target_link_libraries(SourceKitLSP PUBLIC
   Csourcekitd
   BuildServerProtocol
   IndexStoreDB
@@ -42,12 +42,12 @@ target_link_libraries(SourceKit PUBLIC
 
 if(BUILD_SHARED_LIBS)
   get_swift_host_arch(swift_arch)
-  install(TARGETS SourceKit
+  install(TARGETS SourceKitLSP
     ARCHIVE DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
     LIBRARY DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
     RUNTIME DESTINATION bin)
   install(FILES
-    $<TARGET_PROPERTY:SourceKit,Swift_MODULE_DIRECTORY>/SourceKit.swiftdoc
-    $<TARGET_PROPERTY:SourceKit,Swift_MODULE_DIRECTORY>/SourceKit.swiftmodule
+    $<TARGET_PROPERTY:SourceKitLSP,Swift_MODULE_DIRECTORY>/SourceKitLSP.swiftdoc
+    $<TARGET_PROPERTY:SourceKitLSP,Swift_MODULE_DIRECTORY>/SourceKitLSP.swiftmodule
     DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>)
 endif()

Sources/SourceKit/Clang/ClangLanguageServer.swift renamed to Sources/SourceKitLSP/Clang/ClangLanguageServer.swift

@@ -259,7 +259,9 @@ public final class SourceKitServer: LanguageServer {
 
     // Start a new service.
     return orLog("failed to start language service", level: .error) {
-      guard let service = try SourceKit.languageService(for: toolchain, language, options: options, client: self, in: workspace) else {
+      guard let service = try SourceKitLSP.languageService(
+        for: toolchain, language, options: options, client: self, in: workspace)
+      else {
         return nil
       }
 

Sources/SourceKit/DocumentManager.swift renamed to Sources/SourceKitLSP/DocumentManager.swift

@@ -9,7 +9,7 @@ add_executable(sourcekit-lsp
   main.swift)
 target_link_libraries(sourcekit-lsp PRIVATE
   LanguageServerProtocolJSONRPC
-  SourceKit
+  SourceKitLSP
   TSCUtility)
 
 install(TARGETS sourcekit-lsp

Sources/SourceKit/IndexStoreDB+MainFilesProvider.swift renamed to Sources/SourceKitLSP/IndexStoreDB+MainFilesProvider.swift

@@ -17,7 +17,7 @@ import LanguageServerProtocolJSONRPC
 import LSPLogging
 import SKCore
 import SKSupport
-import SourceKit
+import SourceKitLSP
 import Csourcekitd // Not needed here, but fixes debugging...
 import TSCBasic
 import TSCLibc

Sources/SourceKit/SourceKitIndexDelegate.swift renamed to Sources/SourceKitLSP/SourceKitIndexDelegate.swift

@@ -7,7 +7,7 @@ import SKCoreTests
 import SKSupportTests
 import SKSwiftPMWorkspaceTests
 import SourceKitDTests
-import SourceKitTests
+import SourceKitLSPTests
 
 var tests = [XCTestCaseEntry]()
 tests += LSPLoggingTests.__allTests()
@@ -17,6 +17,6 @@ tests += SKCoreTests.__allTests()
 tests += SKSupportTests.__allTests()
 tests += SKSwiftPMWorkspaceTests.__allTests()
 tests += SourceKitDTests.__allTests()
-tests += SourceKitTests.__allTests()
+tests += SourceKitLSPTests.__allTests()
 
 XCTMain(tests)

Sources/SourceKit/SourceKitLSPCommandMetadata.swift renamed to Sources/SourceKitLSP/SourceKitLSPCommandMetadata.swift

@@ -15,7 +15,7 @@ import LanguageServerProtocol
 import LSPTestSupport
 import SKCore
 import SKTestSupport
-import SourceKit
+import SourceKitLSP
 import TSCBasic
 import XCTest
 

Sources/SourceKit/SourceKitServer+Options.swift renamed to Sources/SourceKitLSP/SourceKitServer+Options.swift

@@ -12,7 +12,7 @@
 
 import LanguageServerProtocol
 import SKTestSupport
-import SourceKit
+import SourceKitLSP
 import XCTest
 
 final class CodeActionTests: XCTestCase {

Sources/SourceKit/SourceKitServer.swift renamed to Sources/SourceKitLSP/SourceKitServer.swift

@@ -13,7 +13,7 @@
 import LanguageServerProtocol
 import LSPTestSupport
 import SKTestSupport
-import SourceKit
+import SourceKitLSP
 import XCTest
 
 final class DocumentColorTests: XCTestCase {

Sources/SourceKit/Swift/CommentXML.swift renamed to Sources/SourceKitLSP/Swift/CommentXML.swift

@@ -13,7 +13,7 @@
 import LanguageServerProtocol
 import LSPTestSupport
 import SKTestSupport
-import SourceKit
+import SourceKitLSP
 import XCTest
 
 final class DocumentSymbolTest: XCTestCase {

Sources/SourceKit/Swift/CursorInfo.swift renamed to Sources/SourceKitLSP/Swift/CursorInfo.swift

@@ -13,7 +13,7 @@
 import LanguageServerProtocol
 import LSPTestSupport
 import SKTestSupport
-import SourceKit
+import SourceKitLSP
 import XCTest
 
 final class ExecuteCommandTests: XCTestCase {

Sources/SourceKit/Swift/Diagnostic.swift renamed to Sources/SourceKitLSP/Swift/Diagnostic.swift

@@ -14,7 +14,7 @@ import LanguageServerProtocol
 import LSPLogging
 import LSPTestSupport
 import SKTestSupport
-import SourceKit
+import SourceKitLSP
 import XCTest
 
 // Workaround ambiguity with Foundation.

Sources/SourceKit/Swift/EditorPlaceholder.swift renamed to Sources/SourceKitLSP/Swift/EditorPlaceholder.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SourceKit
+import SourceKitLSP
 import SKCore
 import SKTestSupport
 import LanguageServerProtocol

Sources/SourceKit/Swift/SemanticRefactorCommand.swift renamed to Sources/SourceKitLSP/Swift/SemanticRefactorCommand.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SourceKit
+import SourceKitLSP
 import SKCore
 import XCTest
 

Sources/SourceKit/Swift/SemanticRefactoring.swift renamed to Sources/SourceKitLSP/Swift/SemanticRefactoring.swift

@@ -13,7 +13,7 @@
 import LanguageServerProtocol
 import LSPTestSupport
 import SKTestSupport
-import SourceKit
+import SourceKitLSP
 import XCTest
 
 final class SwiftCompletionTests: XCTestCase {