Update to latest Extendable, LanguageClient; concurrency warnings

Author: mattmassicotte

Package.swift

@@ -12,10 +12,10 @@ let package = Package(
 	],
 	dependencies: [
 		.package(url: "https://github.com/ChimeHQ/AsyncXPCConnection", from: "1.0.0"),
-		.package(url: "https://github.com/ChimeHQ/Extendable", from: "0.1.1"),
+		.package(url: "https://github.com/ChimeHQ/Extendable", from: "0.3.0"),
 		.package(url: "https://github.com/ChimeHQ/ProcessEnv", from: "1.0.0"),
-		.package(url: "https://github.com/ChimeHQ/LanguageClient", from: "0.7.1"),
-		.package(url: "https://github.com/ChimeHQ/LanguageServerProtocol", from: "0.12.0"),
+		.package(url: "https://github.com/ChimeHQ/LanguageClient", from: "0.8.0"),
+		.package(url: "https://github.com/ChimeHQ/LanguageServerProtocol", from: "0.13.0"),
 		.package(url: "https://github.com/mattmassicotte/Queue", from: "0.1.4"),
 		.package(url: "https://github.com/ChimeHQ/JSONRPC", from: "0.9.0"),
 	],

Sources/ChimeExtensionInterface/ChimeExtension.swift

@@ -38,8 +38,10 @@ extension ChimeExtension {
 		}
 	}
 
-	public var configuration: ConnectingAppExtensionConfiguration {
-		return globalConfiguration
+	public nonisolated var configuration: ConnectingAppExtensionConfiguration {
+		MainActor.runUnsafely {
+			return globalConfiguration
+		}
 	}
 }
 
@@ -53,8 +55,10 @@ public protocol SidebarChimeUIExtension<Scene>: ChimeExtension {
 
 @available(macOS 13.0, *)
 extension SidebarChimeUIExtension {
-    public var configuration: AppExtensionSceneConfiguration {
-		return AppExtensionSceneConfiguration(self.scene, configuration: globalConfiguration)
+	public nonisolated var configuration: AppExtensionSceneConfiguration {
+		MainActor.runUnsafely {
+			return AppExtensionSceneConfiguration(self.scene, configuration: globalConfiguration)
+		}
     }
 }
 
@@ -69,6 +73,8 @@ public protocol DocumentSyncedChimeUIExtension<Scene>: ChimeExtension {
 @available(macOS 13.0, *)
 extension DocumentSyncedChimeUIExtension {
 	public var configuration: AppExtensionSceneConfiguration {
-		return AppExtensionSceneConfiguration(self.scene, configuration: globalConfiguration)
+		MainActor.runUnsafely {
+			return AppExtensionSceneConfiguration(self.scene, configuration: globalConfiguration)
+		}
 	}
 }

Sources/ChimeExtensionInterface/MainActor+runUnsafely.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+extension MainActor {
+	/// Execute the given body closure on the main actor without enforcing MainActor isolation.
+	///
+	/// It will crash if run on any non-main thread.
+	@_unavailableFromAsync
+	static func runUnsafely<T>(_ body: @MainActor () throws -> T) rethrows -> T {
+#if swift(>=5.9)
+		if #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) {
+			return try MainActor.assumeIsolated(body)
+		}
+#endif
+
+		dispatchPrecondition(condition: .onQueue(.main))
+		return try withoutActuallyEscaping(body) { fn in
+			try unsafeBitCast(fn, to: (() throws -> T).self)()
+		}
+	}
+}
+

Sources/ChimeExtensionInterface/Scenes.swift

@@ -6,7 +6,7 @@ import Extendable
 
 /// Identifier used to distinuish scenes provided by an extension.
 public enum ChimeExtensionSceneIdentifier: String, CaseIterable, Hashable, Codable, Sendable {
-    case main
+	case main
 }
 
 /// Base protocol used by all Chime extension scenes.
@@ -29,17 +29,19 @@ extension AppExtensionSceneGroup: ChimeExtensionScene {
 @available(macOS 13.0, *)
 @MainActor
 public struct SidebarScene<Content: View>: ChimeExtensionScene {
-    private let content: () -> Content
+	private let content: () -> Content
 
-    public init(content: @escaping () ->  Content) {
-        self.content = content
-    }
+	public init(content: @escaping () ->  Content) {
+		self.content = content
+	}
 
-    public var body: some AppExtensionScene {
-		ConnectingAppExtensionScene(sceneID: ChimeExtensionSceneIdentifier.main.rawValue) { _, connection in
-			SceneContextView(connection: connection, content)
+	public nonisolated var body: some AppExtensionScene {
+		MainActor.runUnsafely {
+			ConnectingAppExtensionScene(sceneID: ChimeExtensionSceneIdentifier.main.rawValue) { _, connection in
+				SceneContextView(connection: connection, content)
+			}
 		}
-    }
+	}
 }
 
 /// An editor sidebar view with a horizontal size kept in sync with the current document.
@@ -59,9 +61,11 @@ public struct DocumentSyncedScene<Content: View>: ChimeExtensionScene {
 		self.content = content
 	}
 
-	public var body: some AppExtensionScene {
-		ConnectingAppExtensionScene(sceneID: ChimeExtensionSceneIdentifier.main.rawValue) { _, connection in
-			SceneContextView(connection: connection, content)
+	public nonisolated var body: some AppExtensionScene {
+		MainActor.runUnsafely {
+			ConnectingAppExtensionScene(sceneID: ChimeExtensionSceneIdentifier.main.rawValue) { _, connection in
+				SceneContextView(connection: connection, content)
+			}
 		}
 	}
 }

Sources/ChimeLSPAdapter/LSPDocumentService.swift

@@ -80,7 +80,7 @@ extension LSPDocumentService: DocumentService {
 		let params = DidChangeTextDocumentParams(textDocument: versionedId,
 												 contentChanges: events)
 
-		try await serverHostInterface.server.textDocumentDidChange(params: params)
+		try await serverHostInterface.server.textDocumentDidChange(params)
 	}
 
 	func didApplyChange(_ change: CombinedTextChange) throws {
@@ -119,7 +119,7 @@ extension LSPDocumentService: DocumentService {
 		serverHostInterface.enqueue(barrier: true) { server, _, _ in
 			let params = WillSaveTextDocumentParams(textDocument: id, reason: .manual)
 
-			try await server.textDocumentWillSave(params: params)
+			try await server.textDocumentWillSave(params)
 		}
 	}
 
@@ -146,7 +146,7 @@ extension LSPDocumentService: CompletionService {
 			let params = CompletionParams(textDocument: textDocId, position: lspPosition, context: lspContext)
 
 			do {
-				let response = try await server.completion(params: params)
+				let response = try await server.completion(params)
 
 
 				let fallbackRange = TextRange.range(NSRange(location: location, length: 0))
@@ -179,7 +179,7 @@ extension LSPDocumentService: FormattingService {
 											insertSpaces: configuration.indentIsSoft)
 			let params = DocumentFormattingParams(textDocument: textDocId, options: options)
 
-			let response = try await server.formatting(params: params)
+			let response = try await server.formatting(params)
 
 			let transformer = transformers.textEditsTransformer
 
@@ -212,7 +212,7 @@ extension LSPDocumentService: FormattingService {
 								 end: Position(line: 1, character: 0))
 			let params = CodeActionParams(textDocument: textDocId, range: range, context: context)
 
-			let response = try await server.codeAction(params: params)
+			let response = try await server.codeAction(params)
 
 			return transformers.organizeImportsTransformer(uri, response)
 		}
@@ -225,7 +225,7 @@ extension LSPDocumentService: SemanticDetailsService {
 			let textDocId = try context.textDocumentIdentifier
 			let params = TextDocumentPositionParams(textDocument: textDocId, position: position.lspPosition)
 
-			let response = try await server.hover(params: params)
+			let response = try await server.hover(params)
 
 			return transformers.hoverTransformer(position, response)
 		}
@@ -238,7 +238,7 @@ extension LSPDocumentService: DefinitionService {
 			let textDocId = try context.textDocumentIdentifier
 			let params = TextDocumentPositionParams(textDocument: textDocId, position: position.lspPosition)
 
-			let definition = try await server.definition(params: params)
+			let definition = try await server.definition(params)
 
 			return transformers.definitionTransformer(definition)
 		}
@@ -257,13 +257,13 @@ extension LSPDocumentService: TokenService {
 		if deltas, let lastId = lastResultId {
 			let params = SemanticTokensDeltaParams(textDocument: id, previousResultId: lastId)
 
-			return try await server.semanticTokensFullDelta(params: params)
+			return try await server.semanticTokensFullDelta(params)
 		}
 
 		let params = SemanticTokensParams(textDocument: id)
 
 		// translate into a delta response
-		return try await server.semanticTokensFull(params: params).map { .optionA($0) }
+		return try await server.semanticTokensFull(params).map { .optionA($0) }
 	}
 
 	func tokens(in range: CombinedTextRange) async throws -> [ChimeExtensionInterface.Token] {

Sources/ChimeLSPAdapter/LSPProjectService.swift

@@ -263,7 +263,7 @@ extension LSPProjectService {
 		let params = DidChangeWatchedFilesParams(changes: [event])
 
 		serverHostInterface.enqueue(barrier: true) { server, _, _ in
-			try await server.workspaceDidChangeWatchedFiles(params: params)
+			try await server.workspaceDidChangeWatchedFiles(params)
 		}
 	}
 
@@ -336,7 +336,7 @@ extension LSPProjectService: ApplicationService {
 			let item = try await docConnection.textDocumentItem
 
 			let params = DidOpenTextDocumentParams(textDocument: item)
-			try await server.textDocumentDidOpen(params: params)
+			try await server.textDocumentDidOpen(params)
 		}
 	}
 
@@ -362,7 +362,7 @@ extension LSPProjectService: ApplicationService {
 			let id = try docContext.textDocumentIdentifier
 
 			let param = DidCloseTextDocumentParams(textDocument: id)
-			try await server.textDocumentDidClose(params: param)
+			try await server.textDocumentDidClose(param)
 		}
 	}
 
@@ -402,7 +402,7 @@ extension LSPProjectService: SymbolQueryService {
 			}
 
 			let params = WorkspaceSymbolParams(query: query)
-			let result = try await server.workspaceSymbol(params: params)
+			let result = try await server.workspaceSymbol(params)
 
 			return transformers.workspaceSymbolResponseTransformer(result)
 		}