@theia/plugin-ext 1.34.1 → 1.34.3

package/src/plugin/label-service.ts

@@ -1,36 +1,36 @@
-// *****************************************************************************
-// Copyright (C) 2020 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ResourceLabelFormatter } from '@theia/plugin';
-import { Disposable } from '@theia/core/lib/common/disposable';
-import { LabelServiceExt, LabelServiceMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
-import { RPCProtocol } from '../common/rpc-protocol';
-
-export class LabelServiceExtImpl implements LabelServiceExt {
-    private handle: number = 0;
-    private proxy: LabelServiceMain;
-    constructor(readonly rpc: RPCProtocol) {
-        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.LABEL_SERVICE_MAIN);
-    }
-
-    $registerResourceLabelFormatter(formatter: ResourceLabelFormatter): Disposable {
-        const handle = this.handle++;
-        this.proxy.$registerResourceLabelFormatter(handle, formatter);
-        return Disposable.create(() => {
-            this.proxy.$unregisterResourceLabelFormatter(handle);
-        });
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ResourceLabelFormatter } from '@theia/plugin';
+import { Disposable } from '@theia/core/lib/common/disposable';
+import { LabelServiceExt, LabelServiceMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
+import { RPCProtocol } from '../common/rpc-protocol';
+
+export class LabelServiceExtImpl implements LabelServiceExt {
+    private handle: number = 0;
+    private proxy: LabelServiceMain;
+    constructor(readonly rpc: RPCProtocol) {
+        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.LABEL_SERVICE_MAIN);
+    }
+
+    $registerResourceLabelFormatter(formatter: ResourceLabelFormatter): Disposable {
+        const handle = this.handle++;
+        this.proxy.$registerResourceLabelFormatter(handle, formatter);
+        return Disposable.create(() => {
+            this.proxy.$unregisterResourceLabelFormatter(handle);
+        });
+    }
+}

package/src/plugin/languages/call-hierarchy.ts

@@ -1,124 +1,124 @@
-// *****************************************************************************
-// Copyright (C) 2020 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { URI } from '@theia/core/shared/vscode-uri';
-import * as theia from '@theia/plugin';
-import { DocumentsExtImpl } from '../documents';
-import * as dto from '../../common/plugin-api-rpc-model';
-import * as rpc from '../../common/plugin-api-rpc';
-import * as types from '../types-impl';
-import { fromRange, SymbolKind } from '../type-converters';
-
-export class CallHierarchyAdapter {
-
-    constructor(
-        private readonly provider: theia.CallHierarchyProvider,
-        private readonly documents: DocumentsExtImpl
-    ) { }
-
-    protected sessionIds = 0;
-    protected readonly cache = new Map<string, Map<string, theia.CallHierarchyItem>>();
-
-    async provideRootDefinition(
-        resource: URI, position: rpc.Position, token: theia.CancellationToken
-    ): Promise<dto.CallHierarchyItem[] | undefined> {
-        const documentData = this.documents.getDocumentData(resource);
-        if (!documentData) {
-            return Promise.reject(new Error(`There is no document for ${resource}`));
-        }
-
-        const definition = await this.provider.prepareCallHierarchy(documentData.document,
-            new types.Position(
-                position.lineNumber,
-                position.column
-            ),
-            token
-        );
-
-        if (!definition) {
-            return undefined;
-        }
-        const sessionId = (this.sessionIds++).toString(36);
-        this.cache.set(sessionId, new Map());
-        return Array.isArray(definition) ? definition.map(item => this.fromCallHierarchyItem(item, sessionId)) : [this.fromCallHierarchyItem(definition, sessionId)];
-    }
-
-    async provideCallers(definition: dto.CallHierarchyItem, token: theia.CancellationToken): Promise<dto.CallHierarchyIncomingCall[] | undefined> {
-        const callers = await this.provider.provideCallHierarchyIncomingCalls(this.toCallHierarchyItem(definition), token);
-        if (!callers) {
-            return undefined;
-        }
-
-        return callers.map(item => this.fromCallHierarchyIncomingCall(item, definition._sessionId!));
-    }
-
-    async provideCallees(definition: dto.CallHierarchyItem, token: theia.CancellationToken): Promise<dto.CallHierarchyOutgoingCall[] | undefined> {
-        const callees = await this.provider.provideCallHierarchyOutgoingCalls(this.toCallHierarchyItem(definition), token);
-        if (!callees) {
-            return undefined;
-        }
-
-        return callees.map(item => this.fromCallHierarchyOutgoingCall(item, definition._sessionId!));
-    }
-
-    private fromCallHierarchyItem(item: theia.CallHierarchyItem, sessionId: string): dto.CallHierarchyItem {
-        const sessionCache = this.cache.get(sessionId)!;
-        const itemId = sessionCache.size.toString(36);
-        const definition: dto.CallHierarchyItem = {
-            uri: item.uri,
-            range: fromRange(item.range),
-            selectionRange: fromRange(item.selectionRange),
-            name: item.name,
-            kind: SymbolKind.fromSymbolKind(item.kind),
-            tags: item.tags,
-            _itemId: itemId,
-            _sessionId: sessionId,
-        };
-        sessionCache.set(itemId, item);
-        return definition;
-    }
-
-    private toCallHierarchyItem(definition: dto.CallHierarchyItem): theia.CallHierarchyItem {
-        const cached = this.cache.get(definition._sessionId!)?.get(definition._itemId!);
-        if (!cached) {
-            throw new Error(`Found no cached item corresponding to ${definition.name} in ${definition.uri.path} with ID ${definition.data}.`);
-        }
-        return cached;
-    }
-
-    private fromCallHierarchyIncomingCall(caller: theia.CallHierarchyIncomingCall, sessionId: string): dto.CallHierarchyIncomingCall {
-        return {
-            from: this.fromCallHierarchyItem(caller.from, sessionId),
-            fromRanges: caller.fromRanges.map(r => fromRange(r))
-        };
-    }
-
-    protected fromCallHierarchyOutgoingCall(caller: theia.CallHierarchyOutgoingCall, sessionId: string): dto.CallHierarchyOutgoingCall {
-        return {
-            to: this.fromCallHierarchyItem(caller.to, sessionId),
-            fromRanges: caller.fromRanges.map(r => fromRange(r)),
-        };
-    }
-
-    releaseSession(session?: string): Promise<boolean> {
-        if (session !== undefined) {
-            return Promise.resolve(this.cache.delete(session));
-        } else {
-            this.cache.clear();
-            return Promise.resolve(true);
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { URI } from '@theia/core/shared/vscode-uri';
+import * as theia from '@theia/plugin';
+import { DocumentsExtImpl } from '../documents';
+import * as dto from '../../common/plugin-api-rpc-model';
+import * as rpc from '../../common/plugin-api-rpc';
+import * as types from '../types-impl';
+import { fromRange, SymbolKind } from '../type-converters';
+
+export class CallHierarchyAdapter {
+
+    constructor(
+        private readonly provider: theia.CallHierarchyProvider,
+        private readonly documents: DocumentsExtImpl
+    ) { }
+
+    protected sessionIds = 0;
+    protected readonly cache = new Map<string, Map<string, theia.CallHierarchyItem>>();
+
+    async provideRootDefinition(
+        resource: URI, position: rpc.Position, token: theia.CancellationToken
+    ): Promise<dto.CallHierarchyItem[] | undefined> {
+        const documentData = this.documents.getDocumentData(resource);
+        if (!documentData) {
+            return Promise.reject(new Error(`There is no document for ${resource}`));
+        }
+
+        const definition = await this.provider.prepareCallHierarchy(documentData.document,
+            new types.Position(
+                position.lineNumber,
+                position.column
+            ),
+            token
+        );
+
+        if (!definition) {
+            return undefined;
+        }
+        const sessionId = (this.sessionIds++).toString(36);
+        this.cache.set(sessionId, new Map());
+        return Array.isArray(definition) ? definition.map(item => this.fromCallHierarchyItem(item, sessionId)) : [this.fromCallHierarchyItem(definition, sessionId)];
+    }
+
+    async provideCallers(definition: dto.CallHierarchyItem, token: theia.CancellationToken): Promise<dto.CallHierarchyIncomingCall[] | undefined> {
+        const callers = await this.provider.provideCallHierarchyIncomingCalls(this.toCallHierarchyItem(definition), token);
+        if (!callers) {
+            return undefined;
+        }
+
+        return callers.map(item => this.fromCallHierarchyIncomingCall(item, definition._sessionId!));
+    }
+
+    async provideCallees(definition: dto.CallHierarchyItem, token: theia.CancellationToken): Promise<dto.CallHierarchyOutgoingCall[] | undefined> {
+        const callees = await this.provider.provideCallHierarchyOutgoingCalls(this.toCallHierarchyItem(definition), token);
+        if (!callees) {
+            return undefined;
+        }
+
+        return callees.map(item => this.fromCallHierarchyOutgoingCall(item, definition._sessionId!));
+    }
+
+    private fromCallHierarchyItem(item: theia.CallHierarchyItem, sessionId: string): dto.CallHierarchyItem {
+        const sessionCache = this.cache.get(sessionId)!;
+        const itemId = sessionCache.size.toString(36);
+        const definition: dto.CallHierarchyItem = {
+            uri: item.uri,
+            range: fromRange(item.range),
+            selectionRange: fromRange(item.selectionRange),
+            name: item.name,
+            kind: SymbolKind.fromSymbolKind(item.kind),
+            tags: item.tags,
+            _itemId: itemId,
+            _sessionId: sessionId,
+        };
+        sessionCache.set(itemId, item);
+        return definition;
+    }
+
+    private toCallHierarchyItem(definition: dto.CallHierarchyItem): theia.CallHierarchyItem {
+        const cached = this.cache.get(definition._sessionId!)?.get(definition._itemId!);
+        if (!cached) {
+            throw new Error(`Found no cached item corresponding to ${definition.name} in ${definition.uri.path} with ID ${definition.data}.`);
+        }
+        return cached;
+    }
+
+    private fromCallHierarchyIncomingCall(caller: theia.CallHierarchyIncomingCall, sessionId: string): dto.CallHierarchyIncomingCall {
+        return {
+            from: this.fromCallHierarchyItem(caller.from, sessionId),
+            fromRanges: caller.fromRanges.map(r => fromRange(r))
+        };
+    }
+
+    protected fromCallHierarchyOutgoingCall(caller: theia.CallHierarchyOutgoingCall, sessionId: string): dto.CallHierarchyOutgoingCall {
+        return {
+            to: this.fromCallHierarchyItem(caller.to, sessionId),
+            fromRanges: caller.fromRanges.map(r => fromRange(r)),
+        };
+    }
+
+    releaseSession(session?: string): Promise<boolean> {
+        if (session !== undefined) {
+            return Promise.resolve(this.cache.delete(session));
+        } else {
+            this.cache.clear();
+            return Promise.resolve(true);
+        }
+    }
+}

package/src/plugin/languages/code-action.ts

@@ -1,162 +1,162 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as theia from '@theia/plugin';
-import { URI } from '@theia/core/shared/vscode-uri';
-import { Selection, WorkspaceEditDto } from '../../common/plugin-api-rpc';
-import { Range, CodeActionContext, CodeAction } from '../../common/plugin-api-rpc-model';
-import * as Converter from '../type-converters';
-import { DocumentsExtImpl } from '../documents';
-import { Diagnostics } from './diagnostics';
-import { CodeActionKind } from '../types-impl';
-import { CommandRegistryImpl } from '../command-registry';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { isObject } from '@theia/core/lib/common';
-
-export class CodeActionAdapter {
-
-    constructor(
-        private readonly provider: theia.CodeActionProvider,
-        private readonly document: DocumentsExtImpl,
-        private readonly diagnostics: Diagnostics,
-        private readonly pluginId: string,
-        private readonly commands: CommandRegistryImpl
-    ) { }
-
-    private readonly cache = new Map<number, theia.CodeAction | theia.Command>();
-    private readonly disposables = new Map<number, DisposableCollection>();
-
-    private cacheId = 0;
-
-    async provideCodeAction(resource: URI, rangeOrSelection: Range | Selection,
-        context: CodeActionContext, token: theia.CancellationToken): Promise<CodeAction[] | undefined> {
-        const document = this.document.getDocumentData(resource);
-        if (!document) {
-            return Promise.reject(new Error(`There are no document for ${resource}`));
-        }
-
-        const doc = document.document;
-        const ran = CodeActionAdapter._isSelection(rangeOrSelection)
-            ? <theia.Selection>Converter.toSelection(rangeOrSelection)
-            : <theia.Range>Converter.toRange(rangeOrSelection);
-        const allDiagnostics: theia.Diagnostic[] = [];
-
-        for (const diagnostic of this.diagnostics.getDiagnostics(resource)) {
-            if (ran.intersection(diagnostic.range)) {
-                allDiagnostics.push(diagnostic);
-            }
-        }
-
-        const codeActionContext: theia.CodeActionContext = {
-            diagnostics: allDiagnostics,
-            only: context.only ? new CodeActionKind(context.only) : undefined,
-            triggerKind: Converter.toCodeActionTriggerKind(context.trigger)
-        };
-
-        const commandsOrActions = await this.provider.provideCodeActions(doc, ran, codeActionContext, token);
-
-        if (!Array.isArray(commandsOrActions) || commandsOrActions.length === 0) {
-            return undefined;
-        }
-        const result: CodeAction[] = [];
-        for (const candidate of commandsOrActions) {
-            if (!candidate) {
-                continue;
-            }
-
-            // Cache candidates and created commands.
-            const nextCacheId = this.nextCacheId();
-            const toDispose = new DisposableCollection();
-            this.cache.set(nextCacheId, candidate);
-            this.disposables.set(nextCacheId, toDispose);
-
-            if (CodeActionAdapter._isCommand(candidate)) {
-                result.push({
-                    cacheId: nextCacheId,
-                    title: candidate.title || '',
-                    command: this.commands.converter.toSafeCommand(candidate, toDispose)
-                });
-            } else {
-                if (codeActionContext.only) {
-                    if (!candidate.kind) {
-                        /* eslint-disable-next-line max-len */
-                        console.warn(`${this.pluginId} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
-                    } else if (!codeActionContext.only.contains(candidate.kind)) {
-                        /* eslint-disable-next-line max-len */
-                        console.warn(`${this.pluginId} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code action.`);
-                    }
-                }
-
-                result.push({
-                    cacheId: nextCacheId,
-                    title: candidate.title,
-                    command: this.commands.converter.toSafeCommand(candidate.command, toDispose),
-                    diagnostics: candidate.diagnostics && candidate.diagnostics.map(Converter.convertDiagnosticToMarkerData),
-                    edit: candidate.edit && Converter.fromWorkspaceEdit(candidate.edit),
-                    kind: candidate.kind && candidate.kind.value,
-                    disabled: candidate.disabled,
-                    isPreferred: candidate.isPreferred
-                });
-            }
-        }
-
-        return result;
-    }
-
-    async releaseCodeActions(cacheIds: number[]): Promise<void> {
-        cacheIds.forEach(id => {
-            this.cache.delete(id);
-            const toDispose = this.disposables.get(id);
-            if (toDispose) {
-                toDispose.dispose();
-                this.disposables.delete(id);
-            }
-        });
-    }
-
-    async resolveCodeAction(cacheId: number, token: theia.CancellationToken): Promise<WorkspaceEditDto | undefined> {
-        if (!this.provider.resolveCodeAction) {
-            return undefined;
-        }
-
-        // Code actions are only resolved if they are not legacy commands and don't have an edit property
-        // https://code.visualstudio.com/api/references/vscode-api#CodeActionProvider
-        const candidate = this.cache.get(cacheId);
-        if (!candidate || CodeActionAdapter._isCommand(candidate) || candidate.edit) {
-            return undefined;
-        }
-
-        const resolved = await this.provider.resolveCodeAction(candidate, token);
-        return resolved?.edit && Converter.fromWorkspaceEdit(resolved.edit);
-    }
-
-    private nextCacheId(): number {
-        return this.cacheId++;
-    }
-
-    private static _isCommand(arg: unknown): arg is theia.Command {
-        return isObject<theia.Command>(arg) && typeof arg.command === 'string';
-    }
-
-    private static _isSelection(arg: unknown): arg is Selection {
-        return isObject<Selection>(arg)
-            && typeof arg.selectionStartLineNumber === 'number'
-            && typeof arg.selectionStartColumn === 'number'
-            && typeof arg.positionLineNumber === 'number'
-            && typeof arg.positionColumn === 'number';
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as theia from '@theia/plugin';
+import { URI } from '@theia/core/shared/vscode-uri';
+import { Selection, WorkspaceEditDto } from '../../common/plugin-api-rpc';
+import { Range, CodeActionContext, CodeAction } from '../../common/plugin-api-rpc-model';
+import * as Converter from '../type-converters';
+import { DocumentsExtImpl } from '../documents';
+import { Diagnostics } from './diagnostics';
+import { CodeActionKind } from '../types-impl';
+import { CommandRegistryImpl } from '../command-registry';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { isObject } from '@theia/core/lib/common';
+
+export class CodeActionAdapter {
+
+    constructor(
+        private readonly provider: theia.CodeActionProvider,
+        private readonly document: DocumentsExtImpl,
+        private readonly diagnostics: Diagnostics,
+        private readonly pluginId: string,
+        private readonly commands: CommandRegistryImpl
+    ) { }
+
+    private readonly cache = new Map<number, theia.CodeAction | theia.Command>();
+    private readonly disposables = new Map<number, DisposableCollection>();
+
+    private cacheId = 0;
+
+    async provideCodeAction(resource: URI, rangeOrSelection: Range | Selection,
+        context: CodeActionContext, token: theia.CancellationToken): Promise<CodeAction[] | undefined> {
+        const document = this.document.getDocumentData(resource);
+        if (!document) {
+            return Promise.reject(new Error(`There are no document for ${resource}`));
+        }
+
+        const doc = document.document;
+        const ran = CodeActionAdapter._isSelection(rangeOrSelection)
+            ? <theia.Selection>Converter.toSelection(rangeOrSelection)
+            : <theia.Range>Converter.toRange(rangeOrSelection);
+        const allDiagnostics: theia.Diagnostic[] = [];
+
+        for (const diagnostic of this.diagnostics.getDiagnostics(resource)) {
+            if (ran.intersection(diagnostic.range)) {
+                allDiagnostics.push(diagnostic);
+            }
+        }
+
+        const codeActionContext: theia.CodeActionContext = {
+            diagnostics: allDiagnostics,
+            only: context.only ? new CodeActionKind(context.only) : undefined,
+            triggerKind: Converter.toCodeActionTriggerKind(context.trigger)
+        };
+
+        const commandsOrActions = await this.provider.provideCodeActions(doc, ran, codeActionContext, token);
+
+        if (!Array.isArray(commandsOrActions) || commandsOrActions.length === 0) {
+            return undefined;
+        }
+        const result: CodeAction[] = [];
+        for (const candidate of commandsOrActions) {
+            if (!candidate) {
+                continue;
+            }
+
+            // Cache candidates and created commands.
+            const nextCacheId = this.nextCacheId();
+            const toDispose = new DisposableCollection();
+            this.cache.set(nextCacheId, candidate);
+            this.disposables.set(nextCacheId, toDispose);
+
+            if (CodeActionAdapter._isCommand(candidate)) {
+                result.push({
+                    cacheId: nextCacheId,
+                    title: candidate.title || '',
+                    command: this.commands.converter.toSafeCommand(candidate, toDispose)
+                });
+            } else {
+                if (codeActionContext.only) {
+                    if (!candidate.kind) {
+                        /* eslint-disable-next-line max-len */
+                        console.warn(`${this.pluginId} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
+                    } else if (!codeActionContext.only.contains(candidate.kind)) {
+                        /* eslint-disable-next-line max-len */
+                        console.warn(`${this.pluginId} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code action.`);
+                    }
+                }
+
+                result.push({
+                    cacheId: nextCacheId,
+                    title: candidate.title,
+                    command: this.commands.converter.toSafeCommand(candidate.command, toDispose),
+                    diagnostics: candidate.diagnostics && candidate.diagnostics.map(Converter.convertDiagnosticToMarkerData),
+                    edit: candidate.edit && Converter.fromWorkspaceEdit(candidate.edit),
+                    kind: candidate.kind && candidate.kind.value,
+                    disabled: candidate.disabled,
+                    isPreferred: candidate.isPreferred
+                });
+            }
+        }
+
+        return result;
+    }
+
+    async releaseCodeActions(cacheIds: number[]): Promise<void> {
+        cacheIds.forEach(id => {
+            this.cache.delete(id);
+            const toDispose = this.disposables.get(id);
+            if (toDispose) {
+                toDispose.dispose();
+                this.disposables.delete(id);
+            }
+        });
+    }
+
+    async resolveCodeAction(cacheId: number, token: theia.CancellationToken): Promise<WorkspaceEditDto | undefined> {
+        if (!this.provider.resolveCodeAction) {
+            return undefined;
+        }
+
+        // Code actions are only resolved if they are not legacy commands and don't have an edit property
+        // https://code.visualstudio.com/api/references/vscode-api#CodeActionProvider
+        const candidate = this.cache.get(cacheId);
+        if (!candidate || CodeActionAdapter._isCommand(candidate) || candidate.edit) {
+            return undefined;
+        }
+
+        const resolved = await this.provider.resolveCodeAction(candidate, token);
+        return resolved?.edit && Converter.fromWorkspaceEdit(resolved.edit);
+    }
+
+    private nextCacheId(): number {
+        return this.cacheId++;
+    }
+
+    private static _isCommand(arg: unknown): arg is theia.Command {
+        return isObject<theia.Command>(arg) && typeof arg.command === 'string';
+    }
+
+    private static _isSelection(arg: unknown): arg is Selection {
+        return isObject<Selection>(arg)
+            && typeof arg.selectionStartLineNumber === 'number'
+            && typeof arg.selectionStartColumn === 'number'
+            && typeof arg.positionLineNumber === 'number'
+            && typeof arg.positionColumn === 'number';
+    }
+
+}