@theia/plugin-ext 1.23.0-next.31 → 1.23.0-next.36

package/src/main/browser/comments/comment-thread-widget.tsx

@@ -114,7 +114,7 @@ export class CommentThreadWidget extends BaseWidget {
         this.commentService.disposeCommentThread(this.owner, this._commentThread.threadId);
     }
 
-    dispose(): void {
+    override dispose(): void {
         super.dispose();
         if (this.commentGlyphWidget) {
             this.commentGlyphWidget.dispose();
@@ -134,7 +134,7 @@ export class CommentThreadWidget extends BaseWidget {
         }
     }
 
-    hide(): void {
+    override hide(): void {
         this.zoneWidget.hide();
         this.isExpanded = false;
         super.hide();
@@ -231,7 +231,7 @@ export class CommentThreadWidget extends BaseWidget {
         return label;
     }
 
-    update(): void {
+    override update(): void {
         if (!this.isExpanded) {
             return;
         }
@@ -342,7 +342,7 @@ export class CommentForm<P extends CommentForm.Props = CommentForm.Props> extend
         }, 100);
     };
 
-    componentDidMount(): void {
+    override componentDidMount(): void {
         // Wait for the widget to be rendered.
         setTimeout(() => {
             this.inputRef.current?.focus();
@@ -377,7 +377,7 @@ export class CommentForm<P extends CommentForm.Props = CommentForm.Props> extend
         });
     }
 
-    render(): React.ReactNode {
+    override render(): React.ReactNode {
         const { commands, commentThread, contextKeyService } = this.props;
         const hasExistingComments = commentThread.comments && commentThread.comments.length > 0;
         return <div className={'comment-form' + (this.state.expanded || commentThread.comments && commentThread.comments.length === 0 ? ' expand' : '')}>
@@ -453,7 +453,7 @@ export class ReviewComment<P extends ReviewComment.Props = ReviewComment.Props>
     protected showHover = () => this.setState({ hover: true });
     protected hideHover = () => this.setState({ hover: false });
 
-    render(): React.ReactNode {
+    override render(): React.ReactNode {
         const { comment, commentForm, contextKeyService, menus, commands, commentThread } = this.props;
         const commentUniqueId = comment.uniqueIdInThread;
         const { hover } = this.state;
@@ -499,7 +499,7 @@ namespace CommentBody {
 }
 
 export class CommentBody extends React.Component<CommentBody.Props> {
-    render(): React.ReactNode {
+    override render(): React.ReactNode {
         const { value, isVisible } = this.props;
         if (!isVisible) {
             return false;
@@ -528,7 +528,7 @@ export class CommentEditContainer extends React.Component<CommentEditContainer.P
     private dirtyCommentMode: CommentMode | undefined;
     private dirtyCommentFormState: boolean | undefined;
 
-    componentDidUpdate(prevProps: Readonly<CommentEditContainer.Props>, prevState: Readonly<{}>): void {
+    override componentDidUpdate(prevProps: Readonly<CommentEditContainer.Props>, prevState: Readonly<{}>): void {
         const commentFormState = this.props.commentForm.current?.state;
         const mode = this.props.comment.mode;
         if (this.dirtyCommentMode !== mode || (this.dirtyCommentFormState !== commentFormState?.expanded && !commentFormState?.expanded)) {
@@ -545,7 +545,7 @@ export class CommentEditContainer extends React.Component<CommentEditContainer.P
         this.dirtyCommentFormState = commentFormState?.expanded;
     }
 
-    render(): React.ReactNode {
+    override render(): React.ReactNode {
         const { menus, comment, commands, commentThread, contextKeyService } = this.props;
         if (!(comment.mode === CommentMode.Editing)) {
             return false;
@@ -588,7 +588,7 @@ namespace CommentsInlineAction {
 }
 
 export class CommentsInlineAction extends React.Component<CommentsInlineAction.Props> {
-    render(): React.ReactNode {
+    override render(): React.ReactNode {
         const { node, commands, contextKeyService, commentThread, commentUniqueId } = this.props;
         if (node.action.when && !contextKeyService.match(node.action.when)) {
             return false;
@@ -618,7 +618,7 @@ namespace CommentActions {
 }
 
 export class CommentActions extends React.Component<CommentActions.Props> {
-    render(): React.ReactNode {
+    override render(): React.ReactNode {
         const { contextKeyService, commands, menu, commentThread, getInput, clearInput } = this.props;
         return <div className={'form-actions'}>
             {menu.children.map((node, index) => node instanceof ActionMenuNode &&
@@ -647,7 +647,7 @@ namespace CommentAction {
 }
 
 export class CommentAction extends React.Component<CommentAction.Props> {
-    render(): React.ReactNode {
+    override render(): React.ReactNode {
         const classNames = ['comments-button', 'comments-text-button', 'theia-button'];
         const { node, commands, contextKeyService, onClick } = this.props;
         if (node.action.when && !contextKeyService.match(node.action.when)) {

package/src/main/browser/custom-editors/custom-editor-widget.ts

@@ -25,9 +25,9 @@ import { CustomEditorModel } from './custom-editors-main';
 
 @injectable()
 export class CustomEditorWidget extends WebviewWidget implements SaveableSource, NavigatableWidget {
-    static FACTORY_ID = 'plugin-custom-editor';
+    static override FACTORY_ID = 'plugin-custom-editor';
 
-    id: string;
+    override id: string;
     resource: URI;
 
     protected _modelRef: Reference<CustomEditorModel>;
@@ -47,7 +47,7 @@ export class CustomEditorWidget extends WebviewWidget implements SaveableSource,
     protected readonly undoRedoService: UndoRedoService;
 
     @postConstruct()
-    protected init(): void {
+    protected override init(): void {
         super.init();
         this.id = CustomEditorWidget.FACTORY_ID + ':' + this.identifier.id;
         this.toDispose.push(this.fileService.onDidRunOperation(e => {
@@ -83,14 +83,14 @@ export class CustomEditorWidget extends WebviewWidget implements SaveableSource,
         return this.resource.withPath(resourceUri.path);
     }
 
-    storeState(): CustomEditorWidget.State {
+    override storeState(): CustomEditorWidget.State {
         return {
             ...super.storeState(),
             strResource: this.resource.toString(),
         };
     }
 
-    restoreState(oldState: CustomEditorWidget.State): void {
+    override restoreState(oldState: CustomEditorWidget.State): void {
         const { strResource } = oldState;
         this.resource = new URI(strResource);
         super.restoreState(oldState);

package/src/main/browser/debug/plugin-debug-session-factory.ts

@@ -34,22 +34,22 @@ import { Channel } from '@theia/debug/lib/common/debug-service';
 
 export class PluginDebugSession extends DebugSession {
     constructor(
-        readonly id: string,
-        readonly options: DebugSessionOptions,
-        readonly parentSession: DebugSession | undefined,
-        protected readonly connection: DebugSessionConnection,
-        protected readonly terminalServer: TerminalService,
-        protected readonly editorManager: EditorManager,
-        protected readonly breakpoints: BreakpointManager,
-        protected readonly labelProvider: LabelProvider,
-        protected readonly messages: MessageClient,
-        protected readonly fileService: FileService,
+        override readonly id: string,
+        override readonly options: DebugSessionOptions,
+        override readonly parentSession: DebugSession | undefined,
+        protected override readonly connection: DebugSessionConnection,
+        protected override readonly terminalServer: TerminalService,
+        protected override readonly editorManager: EditorManager,
+        protected override readonly breakpoints: BreakpointManager,
+        protected override readonly labelProvider: LabelProvider,
+        protected override readonly messages: MessageClient,
+        protected override readonly fileService: FileService,
         protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
-        protected readonly debugContributionProvider: ContributionProvider<DebugContribution>) {
+        protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>) {
         super(id, options, parentSession, connection, terminalServer, editorManager, breakpoints, labelProvider, messages, fileService, debugContributionProvider);
     }
 
-    protected async doCreateTerminal(terminalWidgetOptions: TerminalWidgetOptions): Promise<TerminalWidget> {
+    protected override async doCreateTerminal(terminalWidgetOptions: TerminalWidgetOptions): Promise<TerminalWidget> {
         terminalWidgetOptions = Object.assign({}, terminalWidgetOptions, this.terminalOptionsExt);
         return super.doCreateTerminal(terminalWidgetOptions);
     }
@@ -61,22 +61,22 @@ export class PluginDebugSession extends DebugSession {
  */
 export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
     constructor(
-        protected readonly terminalService: TerminalService,
-        protected readonly editorManager: EditorManager,
-        protected readonly breakpoints: BreakpointManager,
-        protected readonly labelProvider: LabelProvider,
-        protected readonly messages: MessageClient,
-        protected readonly outputChannelManager: OutputChannelManager,
-        protected readonly debugPreferences: DebugPreferences,
+        protected override readonly terminalService: TerminalService,
+        protected override readonly editorManager: EditorManager,
+        protected override readonly breakpoints: BreakpointManager,
+        protected override readonly labelProvider: LabelProvider,
+        protected override readonly messages: MessageClient,
+        protected override readonly outputChannelManager: OutputChannelManager,
+        protected override readonly debugPreferences: DebugPreferences,
         protected readonly connectionFactory: (sessionId: string) => Promise<Channel>,
-        protected readonly fileService: FileService,
+        protected override readonly fileService: FileService,
         protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
-        protected readonly debugContributionProvider: ContributionProvider<DebugContribution>
+        protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>
     ) {
         super();
     }
 
-    get(sessionId: string, options: DebugSessionOptions, parentSession?: DebugSession): DebugSession {
+    override get(sessionId: string, options: DebugSessionOptions, parentSession?: DebugSession): DebugSession {
         const connection = new DebugSessionConnection(
             sessionId,
             this.connectionFactory,

package/src/main/browser/dialogs/modal-notification.ts

@@ -42,7 +42,7 @@ export class ModalNotification extends AbstractDialog<string | undefined> {
         super({ title: FrontendApplicationConfigProvider.get().applicationName });
     }
 
-    protected onCloseRequest(msg: Message): void {
+    protected override onCloseRequest(msg: Message): void {
         this.actionTitle = undefined;
         this.accept();
     }

package/src/main/browser/languages-main.ts

@@ -718,6 +718,8 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
                 const markers = monaco.services.StaticServices.markerService.get().read({ resource: model.uri }).filter(m => monaco.Range.areIntersectingOrTouching(m, range));
                 return this.provideCodeActions(handle, model, range, { markers, only: context.only }, token);
             },
+            resolveCodeAction: (codeAction: monaco.languages.CodeAction, token: monaco.CancellationToken): Promise<monaco.languages.CodeAction> =>
+                this.resolveCodeAction(handle, codeAction, token),
             providedCodeActionKinds
         };
         this.register(handle, monaco.modes.CodeActionProviderRegistry.register(languageSelector, quickFixProvider));
@@ -734,12 +736,20 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         }
         return {
             actions: actions.map(a => toMonacoAction(a)),
-            dispose: () => {
-                // TODO this.proxy.$releaseCodeActions(handle, cacheId);
-            }
+            dispose: () => this.proxy.$releaseCodeActions(handle, actions.map(a => a.cacheId))
         };
     }
 
+    protected async resolveCodeAction(handle: number, codeAction: monaco.languages.CodeAction, token: monaco.CancellationToken): Promise<monaco.languages.CodeAction> {
+        // The cacheId is kept in toMonacoAction when converting a received CodeAction DTO to a monaco code action
+        const cacheId = (codeAction as CodeAction).cacheId;
+        if (cacheId !== undefined) {
+            const resolvedEdit = await this.proxy.$resolveCodeAction(handle, cacheId, token);
+            codeAction.edit = resolvedEdit && toMonacoWorkspaceEdit(resolvedEdit);
+        }
+        return codeAction;
+    }
+
     $registerRenameProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], supportsResolveLocation: boolean): void {
         const languageSelector = this.toLanguageSelector(selector);
         const renameProvider = this.createRenameProvider(handle, supportsResolveLocation);

package/src/main/browser/plugin-authentication-service.ts

@@ -27,12 +27,12 @@ export function getAuthenticationProviderActivationEvent(id: string): string { r
 export class PluginAuthenticationServiceImpl extends AuthenticationServiceImpl implements AuthenticationService {
     @inject(HostedPluginSupport) protected readonly pluginService: HostedPluginSupport;
 
-    async getSessions(id: string, scopes?: string[]): Promise<ReadonlyArray<AuthenticationSession>> {
+    override async getSessions(id: string, scopes?: string[]): Promise<ReadonlyArray<AuthenticationSession>> {
         await this.tryActivateProvider(id);
         return super.getSessions(id, scopes);
     }
 
-    async login(id: string, scopes: string[]): Promise<AuthenticationSession> {
+    override async login(id: string, scopes: string[]): Promise<AuthenticationSession> {
         await this.tryActivateProvider(id);
         return super.login(id, scopes);
     }

package/src/main/browser/plugin-ext-widget.tsx

@@ -52,7 +52,7 @@ export class PluginWidget extends ReactWidget {
         this.toDispose.push(this.pluginService.onDidChangePlugins(() => this.update()));
     }
 
-    protected onActivateRequest(msg: Message): void {
+    protected override onActivateRequest(msg: Message): void {
         super.onActivateRequest(msg);
         this.node.focus();
     }

package/src/main/browser/view/plugin-view-widget.ts

@@ -66,7 +66,7 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         this.toDispose.push(localContext);
     }
 
-    protected onActivateRequest(msg: Message): void {
+    protected override onActivateRequest(msg: Message): void {
         super.onActivateRequest(msg);
         const widget = this.widgets[0];
         if (widget) {
@@ -144,17 +144,17 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         }
     }
 
-    addWidget(widget: Widget): void {
+    override addWidget(widget: Widget): void {
         super.addWidget(widget);
         this.updateWidgetMessage();
     }
 
-    insertWidget(index: number, widget: Widget): void {
+    override insertWidget(index: number, widget: Widget): void {
         super.insertWidget(index, widget);
         this.updateWidgetMessage();
     }
 
-    dispose(): void {
+    override dispose(): void {
         this.toDispose.dispose();
         super.dispose();
     }

package/src/main/browser/view/tree-view-widget.tsx

@@ -118,7 +118,7 @@ export class PluginTree extends TreeImpl {
         return this._isEmpty;
     }
 
-    protected async resolveChildren(parent: CompositeTreeNode): Promise<TreeNode[]> {
+    protected override async resolveChildren(parent: CompositeTreeNode): Promise<TreeNode[]> {
         if (!this._proxy) {
             return super.resolveChildren(parent);
         }
@@ -204,7 +204,7 @@ export class PluginTree extends TreeImpl {
 export class PluginTreeModel extends TreeModelImpl {
 
     @inject(PluginTree)
-    protected readonly tree: PluginTree;
+    protected override readonly tree: PluginTree;
 
     set proxy(proxy: TreeViewsExt | undefined) {
         this.tree.proxy = proxy;
@@ -242,7 +242,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     readonly identifier: TreeViewWidgetIdentifier;
 
     @inject(PluginTreeModel)
-    readonly model: PluginTreeModel;
+    override readonly model: PluginTreeModel;
 
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
@@ -250,11 +250,8 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(TooltipService)
     protected readonly tooltipService: TooltipService;
 
-    protected readonly onDidChangeVisibilityEmitter = new Emitter<boolean>();
-    readonly onDidChangeVisibility = this.onDidChangeVisibilityEmitter.event;
-
     @postConstruct()
-    protected init(): void {
+    protected override init(): void {
         super.init();
         this.id = this.identifier.id;
         this.addClass('theia-tree-view');
@@ -265,7 +262,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         this.toDispose.push(this.onDidChangeVisibilityEmitter);
     }
 
-    protected renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
+    protected override renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
         const icon = this.toNodeIcon(node);
         if (icon) {
             return <div className={icon + ' theia-tree-view-icon'}></div>;
@@ -273,7 +270,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         return undefined;
     }
 
-    protected renderCaption(node: TreeViewNode, props: NodeProps): React.ReactNode {
+    protected override renderCaption(node: TreeViewNode, props: NodeProps): React.ReactNode {
         const classes = [TREE_NODE_SEGMENT_CLASS];
         if (!this.hasTrailingSuffixes(node)) {
             classes.push(TREE_NODE_SEGMENT_GROW_CLASS);
@@ -325,7 +322,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         return React.createElement('div', attrs, ...children);
     }
 
-    protected renderTailDecorations(node: TreeViewNode, props: NodeProps): React.ReactNode {
+    protected override renderTailDecorations(node: TreeViewNode, props: NodeProps): React.ReactNode {
         return this.contextKeys.with({ view: this.id, viewItem: node.contextValue }, () => {
             const menu = this.menus.getMenu(VIEW_ITEM_INLINE_MENU);
             const arg = this.toTreeViewSelection(node);
@@ -352,30 +349,30 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         }} />;
     }
 
-    protected toContextMenuArgs(node: SelectableTreeNode): [TreeViewSelection] {
+    protected override toContextMenuArgs(node: SelectableTreeNode): [TreeViewSelection] {
         return [this.toTreeViewSelection(node)];
     }
 
-    setFlag(flag: Widget.Flag): void {
+    override setFlag(flag: Widget.Flag): void {
         super.setFlag(flag);
         if (flag === Widget.Flag.IsVisible) {
             this.onDidChangeVisibilityEmitter.fire(this.isVisible);
         }
     }
 
-    clearFlag(flag: Widget.Flag): void {
+    override clearFlag(flag: Widget.Flag): void {
         super.clearFlag(flag);
         if (flag === Widget.Flag.IsVisible) {
             this.onDidChangeVisibilityEmitter.fire(this.isVisible);
         }
     }
 
-    handleEnter(event: KeyboardEvent): void {
+    override handleEnter(event: KeyboardEvent): void {
         super.handleEnter(event);
         this.tryExecuteCommand();
     }
 
-    handleClickEvent(node: TreeNode, event: React.MouseEvent<HTMLElement>): void {
+    override handleClickEvent(node: TreeNode, event: React.MouseEvent<HTMLElement>): void {
         super.handleClickEvent(node, event);
         // If clicked on item (not collapsable icon) - execute command or toggle expansion if item has no command
         const commandMap = this.findCommands(node);
@@ -418,7 +415,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         this.update();
     }
 
-    protected render(): React.ReactNode {
+    protected override render(): React.ReactNode {
         const node = React.createElement('div', this.createContainerAttributes(), this.renderSearchInfo(), this.renderTree(this.model));
         this.tooltipService.update();
         return node;
@@ -431,7 +428,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         return undefined;
     }
 
-    shouldShowWelcomeView(): boolean {
+    override shouldShowWelcomeView(): boolean {
         return (this.model.proxy === undefined || this.model.isTreeEmpty) && this.message === undefined;
     }
 }

package/src/main/browser/webview/webview.ts

@@ -198,14 +198,14 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget {
         }));
     }
 
-    protected onBeforeAttach(msg: Message): void {
+    protected override onBeforeAttach(msg: Message): void {
         super.onBeforeAttach(msg);
         this.doShow();
         // iframe has to be reloaded when moved to another DOM element
         this.toDisposeOnDetach.push(Disposable.create(() => this.forceHide()));
     }
 
-    protected onAfterAttach(msg: Message): void {
+    protected override onAfterAttach(msg: Message): void {
         super.onAfterAttach(msg);
         this.addEventListener(this.node, 'focus', () => {
             if (this.element) {
@@ -214,12 +214,12 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget {
         });
     }
 
-    protected onBeforeShow(msg: Message): void {
+    protected override onBeforeShow(msg: Message): void {
         super.onBeforeShow(msg);
         this.doShow();
     }
 
-    protected onAfterHide(msg: Message): void {
+    protected override onAfterHide(msg: Message): void {
         super.onAfterHide(msg);
         this.doHide();
     }
@@ -410,7 +410,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget {
             });
     }
 
-    protected onActivateRequest(msg: Message): void {
+    protected override onActivateRequest(msg: Message): void {
         super.onActivateRequest(msg);
         this.node.focus();
     }

package/src/main/electron-browser/webview/electron-webview-widget-factory.ts

@@ -23,7 +23,7 @@ import { CustomEditorWidget } from '../../browser/custom-editors/custom-editor-w
 
 export class ElectronWebviewWidgetFactory extends WebviewWidgetFactory {
 
-    async createWidget(identifier: WebviewWidgetIdentifier): Promise<WebviewWidget> {
+    override async createWidget(identifier: WebviewWidgetIdentifier): Promise<WebviewWidget> {
         const widget = await super.createWidget(identifier);
         await this.attachElectronSecurityCookie(widget.externalEndpoint);
         return widget;
@@ -47,7 +47,7 @@ export class ElectronWebviewWidgetFactory extends WebviewWidgetFactory {
 
 export class ElectronCustomEditorWidgetFactory extends CustomEditorWidgetFactory {
 
-    async createWidget(identifier: WebviewWidgetIdentifier): Promise<CustomEditorWidget> {
+    override async createWidget(identifier: WebviewWidgetIdentifier): Promise<CustomEditorWidget> {
         const widget = await super.createWidget(identifier);
         await this.attachElectronSecurityCookie(widget.externalEndpoint);
         return widget;

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

@@ -16,7 +16,7 @@
 
 import * as theia from '@theia/plugin';
 import { URI } from '@theia/core/shared/vscode-uri';
-import { Selection } from '../../common/plugin-api-rpc';
+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';
@@ -35,6 +35,11 @@ export class CodeActionAdapter {
         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);
@@ -64,15 +69,21 @@ export class CodeActionAdapter {
         if (!Array.isArray(commandsOrActions) || commandsOrActions.length === 0) {
             return undefined;
         }
-        // TODO cache toDispose and dispose it
-        const toDispose = new DisposableCollection();
         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)
                 });
@@ -88,6 +99,7 @@ export class CodeActionAdapter {
                 }
 
                 result.push({
+                    cacheId: nextCacheId,
                     title: candidate.title,
                     command: this.commands.converter.toSafeCommand(candidate.command, toDispose),
                     diagnostics: candidate.diagnostics && candidate.diagnostics.map(Converter.convertDiagnosticToMarkerData),
@@ -100,6 +112,37 @@ export class CodeActionAdapter {
         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++;
+    }
+
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     private static _isCommand(smth: any): smth is theia.Command {
         return typeof (<theia.Command>smth).command === 'string';

package/src/plugin/languages.ts

@@ -463,6 +463,15 @@ export class LanguagesExtImpl implements LanguagesExt {
     ): Promise<CodeAction[] | undefined> {
         return this.withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeAction(URI.revive(resource), rangeOrSelection, context, token), undefined);
     }
+
+    $releaseCodeActions(handle: number, cacheIds: number[]): void {
+        this.withAdapter(handle, CodeActionAdapter, adapter => adapter.releaseCodeActions(cacheIds), undefined);
+    }
+
+    $resolveCodeAction(handle: number, cacheId: number, token: theia.CancellationToken): Promise<WorkspaceEditDto | undefined> {
+        return this.withAdapter(handle, CodeActionAdapter, adapter => adapter.resolveCodeAction(cacheId, token), undefined);
+    };
+
     // ### Code Actions Provider end
 
     // ### Code Lens Provider begin

package/src/plugin/node/debug/plugin-debug-adapter-session.ts

@@ -30,7 +30,7 @@ export class PluginDebugAdapterSession extends DebugAdapterSessionImpl {
     readonly configuration: theia.DebugConfiguration;
 
     constructor(
-        readonly debugAdapter: DebugAdapter,
+        override readonly debugAdapter: DebugAdapter,
         protected readonly tracker: theia.DebugAdapterTracker,
         protected readonly theiaSession: theia.DebugSession) {
 
@@ -41,14 +41,14 @@ export class PluginDebugAdapterSession extends DebugAdapterSessionImpl {
         this.configuration = theiaSession.configuration;
     }
 
-    async start(channel: Channel): Promise<void> {
+    override async start(channel: Channel): Promise<void> {
         if (this.tracker.onWillStartSession) {
             this.tracker.onWillStartSession();
         }
         await super.start(channel);
     }
 
-    async stop(): Promise<void> {
+    override async stop(): Promise<void> {
         if (this.tracker.onWillStopSession) {
             this.tracker.onWillStopSession();
         }
@@ -59,14 +59,14 @@ export class PluginDebugAdapterSession extends DebugAdapterSessionImpl {
         return this.theiaSession.customRequest(command, args);
     }
 
-    protected onDebugAdapterError(error: Error): void {
+    protected override onDebugAdapterError(error: Error): void {
         if (this.tracker.onError) {
             this.tracker.onError(error);
         }
         super.onDebugAdapterError(error);
     }
 
-    protected send(message: string): void {
+    protected override send(message: string): void {
         try {
             super.send(message);
         } finally {
@@ -76,14 +76,14 @@ export class PluginDebugAdapterSession extends DebugAdapterSessionImpl {
         }
     }
 
-    protected write(message: string): void {
+    protected override write(message: string): void {
         if (this.tracker.onWillReceiveMessage) {
             this.tracker.onWillReceiveMessage(JSON.parse(message));
         }
         super.write(message);
     }
 
-    protected onDebugAdapterExit(): void {
+    protected override onDebugAdapterExit(): void {
         if (this.tracker.onExit) {
             this.tracker.onExit(undefined, undefined);
         }