Use LSP 0.12.0

ChimeHQ · Jan 14, 2024 · 679c1c0 · 679c1c0
1 parent 91a3e47
commit 679c1c0
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 9 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -32,7 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/ChimeHQ/LanguageServerProtocol",
       "state" : {
-        "revision" : "a355005e6c00775bb567e1d5927a4d57423474c9"
+        "revision" : "9ae95d89b1a3f2c5da98adea29637c519a7e3c6c",
+        "version" : "0.12.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
 			targets: ["LanguageClient"]),
 	],
 	dependencies: [
-		.package(url: "https://github.com/ChimeHQ/LanguageServerProtocol", from: "0.11.0"),
+		.package(url: "https://github.com/ChimeHQ/LanguageServerProtocol", from: "0.12.0"),
 		.package(url: "https://github.com/Frizlab/FSEventsWrapper", from: "2.1.0"),
 		.package(url: "https://github.com/ChimeHQ/GlobPattern", from: "0.1.1"),
 		.package(url: "https://github.com/ChimeHQ/JSONRPC", from: "0.9.0"),
@@ -30,8 +30,7 @@ let package = Package(
 				.product(name: "FSEventsWrapper", package: "FSEventsWrapper", condition: .when(platforms: [.macOS])),
 				.product(name: "GlobPattern", package: "GlobPattern", condition: .when(platforms: [.macOS])),
 				"JSONRPC",
-				.product(name: "LanguageServerProtocol", package: "LanguageServerProtocol"),
-				.product(name: "LSPClient", package: "LanguageServerProtocol"),
+				"LanguageServerProtocol",
 				.product(name: "ProcessEnv", package: "ProcessEnv", condition: .when(platforms: [.macOS])),
 				"Queue",
 				"Semaphore",

diff --git a/Sources/LanguageClient/InitializingServer.swift b/Sources/LanguageClient/InitializingServer.swift
@@ -5,7 +5,6 @@ import os.log
 
 import Semaphore
 import LanguageServerProtocol
-import LSPClient
 
 enum InitializingServerError: Error {
 	case noStateProvider

diff --git a/Sources/LanguageClient/RestartingServer.swift b/Sources/LanguageClient/RestartingServer.swift
@@ -10,7 +10,6 @@ let NSEC_PER_SEC: UInt64 = 1000000000
 
 import Semaphore
 import LanguageServerProtocol
-import LSPClient
 
 public enum RestartingServerError: Error {
 	case noProvider

diff --git a/Sources/LanguageClient/Server+Shutdown.swift b/Sources/LanguageClient/Server+Shutdown.swift
@@ -1,7 +1,6 @@
 import Foundation
 
 import LanguageServerProtocol
-import LSPClient
 
 extension ServerConnection {
 	/// This function will always attempt to decode "null".

diff --git a/Sources/LanguageClient/StatefulServer.swift b/Sources/LanguageClient/StatefulServer.swift
@@ -1,7 +1,6 @@
 import Foundation
 
 import LanguageServerProtocol
-import LSPClient
 
 extension ServerConnection {
 	public typealias CapabilitiesSequence = AsyncStream<ServerCapabilities>

diff --git a/Tests/LanguageClientTests/ServerTests.swift b/Tests/LanguageClientTests/ServerTests.swift
@@ -1,6 +1,5 @@
 import XCTest
 import LanguageServerProtocol
-import LSPClient
 import LanguageClient
 
 enum ServerTestError: Error {