codeAction/resolve support

README.md

@@ -49,7 +49,7 @@ The LSP [specification](https://microsoft.github.io/language-server-protocol/spe
 | callHierarchy/outgoingCalls | ✅ |
 | client/registerCapability | ✅ |
 | client/unregisterCapability | ✅ |
-| codeAction/resolve | - |
+| codeAction/resolve | ✅ |
 | codeLens/resolve | ✅ |
 | completionItem/resolve | ✅ |
 | documentLink/resolve | ✅ |

Sources/LanguageServerProtocol/Additions/JSONRPCServer.swift

@@ -161,6 +161,8 @@ public actor JSONRPCServer: Server {
 			return try await session.response(to: method, params: params)
 		case .codeAction(let params):
 			return try await session.response(to: method, params: params)
+		case .codeActionResolve(let params):
+			return try await session.response(to: method, params: params)
 		case .codeLens(let params):
 			return try await session.response(to: method, params: params)
 		case .codeLensResolve(let params):

Sources/LanguageServerProtocol/Additions/Server.swift

@@ -113,10 +113,6 @@ public extension Server {
         try await sendRequest(.documentSymbol(params))
     }
 
-    func codeAction(params: CodeActionParams) async throws -> CodeActionResponse {
-        try await sendRequest(.codeAction(params))
-    }
-
     func prepareCallHierarchy(params: CallHierarchyPrepareParams) async throws -> CallHierarchyPrepareResponse {
         try await sendRequest(.prepareCallHierarchy(params))
     }
@@ -223,6 +219,14 @@ public extension Server {
         try await sendRequest(.documentHighlight(params))
     }
 
+	func codeAction(params: CodeActionParams) async throws -> CodeActionResponse {
+		try await sendRequest(.codeAction(params))
+	}
+
+	func codeActionResolve(params: CodeAction) async throws -> CodeAction {
+		try await sendRequest(.codeActionResolve(params))
+	}
+
     func codeLens(params: CodeLensParams) async throws -> CodeLensResponse {
         try await sendRequest(.codeLens(params))
     }

Sources/LanguageServerProtocol/LanguageFeatures/CodeAction.swift

@@ -11,6 +11,7 @@ extension CodeActionKind {
     public static let RefactorRewrite: CodeActionKind = "refactor.rewrite"
     public static let Source: CodeActionKind = "source"
     public static let SourceOrganizeImports: CodeActionKind = "source.organizeImports"
+	public static let SourceFixAll: CodeActionKind = "source.fixAll"
 }
 
 public struct CodeActionClientCapabilities: Codable, Hashable, Sendable {
@@ -55,13 +56,32 @@ public struct CodeActionClientCapabilities: Codable, Hashable, Sendable {
     }
 }
 
+public struct CodeActionOptions: Codable, Hashable, Sendable {
+	public var workDoneProgress: Bool?
+	public var codeActionKinds: [CodeActionKind]?
+	public var resolveProvider: Bool?
+
+	public init(workDoneProgress: Bool?, codeActionKinds: [CodeActionKind]?, resolveProvider: Bool) {
+		self.workDoneProgress = workDoneProgress
+		self.codeActionKinds = codeActionKinds
+		self.resolveProvider = resolveProvider
+	}
+}
+
+public enum CodeActionTriggerKind: Int, Codable, Hashable, Sendable {
+	case invoked = 1
+	case automatic = 2
+}
+
 public struct CodeActionContext: Codable, Hashable, Sendable {
     public let diagnostics: [Diagnostic]
     public let only: [CodeActionKind]?
+	public let triggerKind: CodeActionTriggerKind?
 
-    public init(diagnostics: [Diagnostic] = [], only: [CodeActionKind]? = nil) {
+    public init(diagnostics: [Diagnostic], only: [CodeActionKind]?, triggerKind: CodeActionTriggerKind? = nil) {
         self.diagnostics = diagnostics
         self.only = only
+		self.triggerKind = triggerKind
     }
 }
 

Sources/LanguageServerProtocol/LanguageServerProtocol.swift

@@ -104,6 +104,7 @@ public enum ClientRequest: Sendable, Hashable {
         case textDocumentDocumentHighlight = "textDocument/documentHighlight"
         case textDocumentDocumentSymbol = "textDocument/documentSymbol"
         case textDocumentCodeAction = "textDocument/codeAction"
+		case codeActionResolve = "codeAction/resolve"
         case codeLensResolve = "codeLens/resolve"
         case textDocumentCodeLens = "textDocument/codeLens"
         case textDocumentDocumentLink = "textDocument/documentLink"
@@ -149,6 +150,7 @@ public enum ClientRequest: Sendable, Hashable {
 	case documentHighlight(DocumentHighlightParams)
 	case documentSymbol(DocumentSymbolParams)
 	case codeAction(CodeActionParams)
+	case codeActionResolve(CodeAction)
 	case codeLens(CodeLensParams)
 	case codeLensResolve(CodeLens)
 	case selectionRange(SelectionRangeParams)
@@ -213,6 +215,8 @@ public enum ClientRequest: Sendable, Hashable {
             return .textDocumentDocumentSymbol
         case .codeAction:
             return .textDocumentCodeAction
+		case .codeActionResolve:
+			return .codeActionResolve
         case .codeLens:
             return .textDocumentCodeLens
         case .codeLensResolve:

Sources/LanguageServerProtocol/ServerCapabilities.swift

@@ -108,12 +108,6 @@ public struct DocumentSymbolOptions: Codable, Hashable, Sendable {
     public var label: String?
 }
 
-public struct CodeActionOptions: Codable, Hashable, Sendable {
-    public var workDoneProgress: Bool?
-    public var codeActionKinds: [CodeActionKind]?
-    public var resolveProvider: Bool?
-}
-
 public typealias DocumentColorOptions = WorkDoneProgressOptions
 
 public typealias DocumentColorRegistrationOptions = StaticRegistrationWorkDoneProgressTextDocumentRegistrationOptions