@theia/plugin-ext 1.32.0-next.8 → 1.32.0

package/src/common/plugin-api-rpc.ts

@@ -1407,8 +1407,8 @@ export interface WorkspaceEditMetadataDto {
 }
 
 export interface WorkspaceFileEditDto {
-    oldUri?: UriComponents;
-    newUri?: UriComponents;
+    oldResource?: UriComponents;
+    newResource?: UriComponents;
     options?: FileOperationOptions;
     metadata?: WorkspaceEditMetadataDto;
 }
@@ -1416,7 +1416,7 @@ export interface WorkspaceFileEditDto {
 export interface WorkspaceTextEditDto {
     resource: UriComponents;
     modelVersionId?: number;
-    edit: TextEdit;
+    textEdit: TextEdit;
     metadata?: WorkspaceEditMetadataDto;
 
 }
@@ -1424,9 +1424,9 @@ export namespace WorkspaceTextEditDto {
     export function is(arg: WorkspaceTextEditDto | WorkspaceFileEditDto): arg is WorkspaceTextEditDto {
         return !!arg
             && 'resource' in arg
-            && 'edit' in arg
-            && arg.edit !== null
-            && typeof arg.edit === 'object';
+            && 'textEdit' in arg
+            && arg.textEdit !== null
+            && typeof arg.textEdit === 'object';
     }
 }
 

package/src/hosted/node/hosted-plugin-localization-service.ts

@@ -23,7 +23,7 @@ import { DeployedPlugin, Localization as PluginLocalization, PluginIdentifiers }
 import { URI } from '@theia/core/shared/vscode-uri';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { Disposable } from '@theia/core';
+import { Disposable, MaybePromise } from '@theia/core';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 
 export interface VSCodeNlsConfig {
@@ -56,10 +56,10 @@ export class HostedPluginLocalizationService implements BackendApplicationContri
      */
     ready = this._ready.promise;
 
-    async initialize(): Promise<void> {
-        const cacheDir = await this.getLocalizationCacheDir();
-        await fs.emptyDir(cacheDir);
-        this._ready.resolve();
+    initialize(): MaybePromise<void> {
+        this.getLocalizationCacheDir()
+            .then(cacheDir => fs.emptyDir(cacheDir))
+            .then(() => this._ready.resolve());
     }
 
     deployLocalizations(plugin: DeployedPlugin): void {

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

@@ -289,9 +289,9 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
         const accountUsages = await readAccountUsages(this.storageService, this.id, accountName);
         const sessionsForAccount = this.accounts.get(accountName);
         const result = await this.messageService.info(accountUsages.length
-            ? nls.localizeByDefault('The account {0} has been used by: \n\n{1}\n\n Sign out of these features?', accountName,
+            ? nls.localizeByDefault("The account '{0}' has been used by: \n\n{1}\n\n Sign out from these extensions?", accountName,
                 accountUsages.map(usage => usage.extensionName).join(', '))
-            : nls.localizeByDefault('Sign out of {0}?', accountName),
+            : nls.localizeByDefault("Sign out of '{0}'?", accountName),
             nls.localizeByDefault('Sign Out'),
             Dialog.CANCEL);
 

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

@@ -39,7 +39,7 @@ import {
 import { injectable, inject } from '@theia/core/shared/inversify';
 import {
     SerializedDocumentFilter, MarkerData, Range, RelatedInformation,
-    MarkerSeverity, DocumentLink, WorkspaceSymbolParams, CodeAction, CompletionDto, CodeActionProviderDocumentation, InlayHint, InlayHintLabelPart
+    MarkerSeverity, DocumentLink, WorkspaceSymbolParams, CodeAction, CompletionDto, CodeActionProviderDocumentation, InlayHint, InlayHintLabelPart, CodeActionContext
 } from '../../common/plugin-api-rpc-model';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { MonacoLanguages, WorkspaceSymbolProvider } from '@theia/monaco/lib/browser/monaco-languages';
@@ -868,37 +868,36 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         }
     }
 
-    $registerQuickFixProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], providedCodeActionKinds?: string[],
-        documentation?: CodeActionProviderDocumentation): void {
-
+    $registerQuickFixProvider(
+        handle: number,
+        pluginInfo: PluginInfo,
+        selector: SerializedDocumentFilter[],
+        providedCodeActionKinds?: string[],
+        documentation?: CodeActionProviderDocumentation
+    ): void {
         const languageSelector = this.toLanguageSelector(selector);
-        const quickFixProvider = {
-            provideCodeActions: (model: monaco.editor.ITextModel, range: monaco.Range,
-                context: monaco.languages.CodeActionContext, token: monaco.CancellationToken): monaco.languages.CodeActionList | Promise<monaco.languages.CodeActionList> => {
+        const quickFixProvider: monaco.languages.CodeActionProvider = {
+            provideCodeActions: (model, range, context, token) => {
                 const markers = StandaloneServices.get(IMarkerService)
                     .read({ resource: model.uri })
                     .filter(m => monaco.Range.areIntersectingOrTouching(m, range)) as monaco.editor.IMarkerData[];
-                return this.provideCodeActions(handle, model, range, { markers, only: context.only }, token);
+                return this.provideCodeActions(handle, model, range, { ...context, markers }, token);
             },
-            resolveCodeAction: (codeAction: monaco.languages.CodeAction, token: monaco.CancellationToken): Promise<monaco.languages.CodeAction> =>
-                this.resolveCodeAction(handle, codeAction, token),
-            providedCodeActionKinds,
-            documentation
+            resolveCodeAction: (codeAction, token) => this.resolveCodeAction(handle, codeAction, token)
         };
         this.register(handle, (monaco.languages.registerCodeActionProvider as RegistrationFunction<monaco.languages.CodeActionProvider>)(languageSelector, quickFixProvider));
     }
 
-    protected async provideCodeActions(handle: number, model: monaco.editor.ITextModel,
-        rangeOrSelection: Range, context: monaco.languages.CodeActionContext,
-        token: monaco.CancellationToken): Promise<monaco.languages.CodeActionList | monaco.languages.CodeActionList> {
-        const actions = await this.proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, {
-            ...context,
-            // @monaco-uplift
-            // the current version of monaco.languages.CodeActionContext has no CodeActionTriggerKind
-            trigger: CodeActionTriggerKind.Automatic
-        }, token);
+    protected async provideCodeActions(
+        handle: number,
+        model: monaco.editor.ITextModel,
+        rangeOrSelection: Range,
+        context: monaco.languages.CodeActionContext,
+        token: monaco.CancellationToken
+    ): Promise<monaco.languages.CodeActionList | undefined> {
+        const actions = await this.proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, this.toModelCodeActionContext(context), token);
         if (!actions) {
-            return undefined!;
+            return undefined;
         }
         return {
             actions: actions.map(a => toMonacoAction(a)),
@@ -906,6 +905,22 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         };
     }
 
+    protected toModelCodeActionContext(context: monaco.languages.CodeActionContext): CodeActionContext {
+        return {
+            ...context,
+            trigger: this.toCodeActionTriggerKind(context.trigger)
+        };
+    }
+
+    toCodeActionTriggerKind(type: monaco.languages.CodeActionTriggerType): CodeActionTriggerKind {
+        switch (type) {
+            case monaco.languages.CodeActionTriggerType.Auto:
+                return CodeActionTriggerKind.Automatic;
+            case monaco.languages.CodeActionTriggerType.Invoke:
+                return CodeActionTriggerKind.Invoke;
+        }
+    }
+
     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;
@@ -1283,7 +1298,7 @@ function reviveOnEnterRules(onEnterRules?: SerializedOnEnterRule[]): monaco.lang
     return onEnterRules.map(reviveOnEnterRule);
 }
 
-function reviveInlayLabel(label: string | InlayHintLabelPart[]):  string | monaco.languages.InlayHintLabelPart[] {
+function reviveInlayLabel(label: string | InlayHintLabelPart[]): string | monaco.languages.InlayHintLabelPart[] {
     let monacoLabel: string | monaco.languages.InlayHintLabelPart[];
     if (typeof label === 'string') {
         monacoLabel = label;
@@ -1337,14 +1352,17 @@ export function toMonacoWorkspaceEdit(data: WorkspaceEditDto | undefined): monac
     return {
         edits: (data && data.edits || []).map(edit => {
             if (WorkspaceTextEditDto.is(edit)) {
-                return <monaco.languages.WorkspaceTextEdit>{
+                return <monaco.languages.IWorkspaceTextEdit>{
                     resource: monaco.Uri.revive(edit.resource),
-                    edit: edit.edit, metadata: edit.metadata
+                    textEdit: edit.textEdit,
+                    metadata: edit.metadata
                 };
             } else {
-                return <monaco.languages.WorkspaceFileEdit>{
-                    newUri: monaco.Uri.revive(edit.newUri), oldUri: monaco.Uri.revive(edit.oldUri),
-                    options: edit.options, metadata: edit.metadata
+                return <monaco.languages.IWorkspaceFileEdit>{
+                    newResource: monaco.Uri.revive(edit.newResource),
+                    oldResource: monaco.Uri.revive(edit.oldResource),
+                    options: edit.options,
+                    metadata: edit.metadata
                 };
             }
         })

package/src/main/browser/menus/plugin-menu-command-adapter.ts

@@ -247,9 +247,11 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
 
     protected getSelectedResources(): [CodeUri | TreeViewSelection | undefined, CodeUri[] | undefined] {
         const selection = this.selectionService.selection;
+        const resourceKey = this.resourceContextKey.get();
+        const resourceUri = resourceKey ? CodeUri.parse(resourceKey) : undefined;
         const firstMember = TreeWidgetSelection.is(selection) && selection.source instanceof TreeViewWidget && selection[0]
             ? selection.source.toTreeViewSelection(selection[0])
-            : (UriSelection.getUri(selection) ?? this.resourceContextKey.get())?.['codeUri'];
+            : UriSelection.getUri(selection)?.['codeUri'] ?? resourceUri;
         const secondMember = TreeWidgetSelection.is(selection)
             ? UriSelection.getUris(selection).map(uri => uri['codeUri'])
             : undefined;

package/src/main/browser/plugin-contribution-handler.ts

@@ -15,7 +15,8 @@
 // *****************************************************************************
 
 import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { ITokenTypeMap, IEmbeddedLanguagesMap, StandardTokenType } from 'vscode-textmate';
+import { ITokenTypeMap, IEmbeddedLanguagesMap } from 'vscode-textmate';
+import { StandardTokenType } from 'vscode-textmate/release/encodedTokenAttributes';
 import { TextmateRegistry, getEncodedLanguageId, MonacoTextmateService, GrammarDefinition } from '@theia/monaco/lib/browser/textmate';
 import { MenusContributionPointHandler } from './menus/menus-contribution-handler';
 import { PluginViewRegistry } from './view/plugin-view-registry';

package/src/main/browser/style/index.css

@@ -35,8 +35,13 @@
 }
 
 .theia-plugin-view-container {
-    -webkit-mask: url('');
-    mask: url('');
+    /*
+        It might take a second or two until the real plugin mask is loaded
+        To prevent flickering on the icon, we set a transparent mask instead
+        Since masks only support images, svg or gradients, we create a transparent gradient here
+    */
+    -webkit-mask: linear-gradient(transparent, transparent);
+    mask: linear-gradient(transparent, transparent);
     background-color: var(--theia-activityBar-inactiveForeground);
 }
 
@@ -51,10 +56,10 @@
 .theia-plugin-root-folder-expanded-icon,
 .theia-plugin-root-folder-expanded-icon::before {
     padding-right: var(--theia-ui-padding);
-	width: var(--theia-icon-size);
-	height: var(--theia-content-line-height);
-	line-height: inherit !important;
-	display: inline-block;
+    width: var(--theia-icon-size);
+    height: var(--theia-content-line-height);
+    line-height: inherit !important;
+    display: inline-block;
 }
 
 .p-TabBar.theia-app-sides .theia-plugin-file-icon,

package/src/main/browser/text-editor-main.ts

@@ -282,7 +282,8 @@ export class TextEditorMain implements Disposable {
         if (!this.editor) {
             return;
         }
-        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorations('Plugin decorations', key, ranges.map(option => Object.assign(option, { color: undefined })));
+        (this.editor.getControl() as unknown as StandaloneCodeEditor)
+            .setDecorationsByType('Plugin decorations', key, ranges.map(option => Object.assign(option, { color: undefined })));
     }
 
     setDecorationsFast(key: string, _ranges: number[]): void {
@@ -294,7 +295,7 @@ export class TextEditorMain implements Disposable {
         for (let i = 0; i < len; i++) {
             ranges[i] = new monaco.Range(_ranges[4 * i], _ranges[4 * i + 1], _ranges[4 * i + 2], _ranges[4 * i + 3]);
         }
-        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorationsFast(key, ranges);
+        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorationsByTypeFast(key, ranges);
     }
 
     private static toMonacoSelections(selection: Selection): monaco.Selection {

package/src/main/browser/theme-icon-override.ts

@@ -28,13 +28,44 @@ const codeIconMap: Record<string, string> = {
     'callstack-view-icon': 'debug-alt',
     'callstack-view-session': 'bug',
     'comments-view-icon': 'comment-discussion',
+    'debug-breakpoint': 'debug-breakpoint',
+    'debug-breakpoint-conditional': 'debug-breakpoint-conditional',
+    'debug-breakpoint-conditional-disabled': 'debug-breakpoint-conditional-disabled',
+    'debug-breakpoint-conditional-verified': 'debug-breakpoint-conditional-unverified',
+    'debug-breakpoint-data': 'debug-breakpoint-data',
+    'debug-breakpoint-data-disabled': 'debug-breakpoint-data-disabled',
+    'debug-breakpoint-data-unverified': 'debug-breakpoint-data-unverified',
+    'debug-breakpoint-disabled': 'debug-breakpoint-disabled',
+    'debug-breakpoint-function': 'debug-breakpoint-function',
+    'debug-breakpoint-function-disabled': 'debug-breakpoint-function-disabled',
+    'debug-breakpoint-function-unverified': 'debug-breakpoint-function-unverified',
+    'debug-breakpoint-log': 'debug-breakpoint-log',
+    'debug-breakpoint-log-disabled': 'debug-breakpoint-log-disabled',
+    'debug-breakpoint-log-unverified': 'debug-breakpoint-log-unverified',
+    'debug-breakpoint-unsupported': 'debug-breakpoint-unsupported',
+    'debug-breakpoint-unverified': 'debug-breakpoint-unverified',
     'debug-collapse-all': 'collapse-all',
     'debug-configure': 'gear',
     'debug-console-clear-all': 'clear-all',
     'debug-console-evaluation-input': 'arrow-small-right',
     'debug-console-evaluation-prompt': 'chevron-right',
     'debug-console-view-icon': 'debug-console',
+    'debug-continue': 'debug-continue',
+    'debug-disconnect': 'debug-disconnect',
     'debug-gripper': 'gripper',
+    'debug-hint': 'debug-hint',
+    'debug-pause': 'debug-pause',
+    'debug-restart': 'debug-restart',
+    'debug-restart-frame': 'debug-restart-frame',
+    'debug-reverse-continue': 'debug-reverse-continue',
+    'debug-stackframe': 'debug-stackframe',
+    'debug-stackframe-focused': 'debug-stackframe-focused',
+    'debug-start': 'debug-start',
+    'debug-step-back': 'debug-step-back',
+    'debug-step-into': 'debug-step-into',
+    'debug-step-out': 'debug-step-out',
+    'debug-step-over': 'debug-step-over',
+    'debug-stop': 'debug-stop',
     'default-view-icon': 'window',
     'diff-editor-next-change': 'arrow-down',
     'diff-editor-previous-change': 'arrow-up',

package/src/main/browser/view/plugin-tree-view-node-label-provider.ts

@@ -34,7 +34,7 @@ export class PluginTreeViewNodeLabelProvider implements LabelProviderContributio
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     canHandle(element: TreeViewNode | any): number {
         if (TreeNode.is(element) && ('resourceUri' in element || 'themeIcon' in element)) {
-            return this.treeLabelProvider.canHandle(element) + 1;
+            return Number.MAX_SAFE_INTEGER - 512;
         }
         return 0;
     }

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

@@ -30,19 +30,19 @@ import {
     TREE_NODE_TAIL_CLASS,
     TreeModelImpl,
     TreeViewWelcomeWidget,
-    TooltipService,
-    TooltipAttributes
+    TooltipAttributes,
+    TreeSelection,
+    HoverService
 } from '@theia/core/lib/browser';
 import { MenuPath, MenuModelRegistry, ActionMenuNode } from '@theia/core/lib/common/menu';
 import * as React from '@theia/core/shared/react';
 import { PluginSharedStyle } from '../plugin-shared-style';
-import { ACTION_ITEM, codicon, Widget } from '@theia/core/lib/browser/widgets/widget';
+import { ACTION_ITEM, Widget } from '@theia/core/lib/browser/widgets/widget';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { View } from '../../../common/plugin-protocol';
 import CoreURI from '@theia/core/lib/common/uri';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
-import * as markdownit from '@theia/core/shared/markdown-it';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
 import { LabelParser } from '@theia/core/lib/browser/label-parser';
 import { AccessibilityInformation } from '@theia/plugin';
@@ -408,8 +408,8 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
-    @inject(TooltipService)
-    protected readonly tooltipService: TooltipService;
+    @inject(HoverService)
+    protected readonly hoverService: HoverService;
 
     @inject(LabelParser)
     protected readonly labelParser: LabelParser;
@@ -417,33 +417,18 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(ColorRegistry)
     protected readonly colorRegistry: ColorRegistry;
 
-    protected readonly markdownIt = markdownit();
-
     @postConstruct()
     protected override init(): void {
         super.init();
         this.id = this.identifier.id;
         this.addClass('theia-tree-view');
         this.node.style.height = '100%';
-        this.markdownItPlugin();
         this.model.onDidChangeWelcomeState(this.update, this);
         this.toDispose.push(this.model.onDidChangeWelcomeState(this.update, this));
         this.toDispose.push(this.onDidChangeVisibilityEmitter);
         this.toDispose.push(this.contextKeyService.onDidChange(() => this.update()));
     }
 
-    protected markdownItPlugin(): void {
-        this.markdownIt.renderer.rules.text = (tokens, idx) => {
-            const content = tokens[idx].content;
-            return this.labelParser.parse(content).map(chunk => {
-                if (typeof chunk === 'string') {
-                    return chunk;
-                }
-                return `<i class="${codicon(chunk.name)} ${chunk.animation ? `fa-${chunk.animation}` : ''} icon-inline"></i>`;
-            }).join('');
-        };
-    }
-
     protected override renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
         const icon = this.toNodeIcon(node);
         if (icon) {
@@ -480,16 +465,21 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
             };
         }
 
-        const elementRef = React.createRef<HTMLDivElement & Partial<TooltipAttributes>>();
         if (!node.tooltip && node instanceof ResolvableTreeViewNode) {
             let configuredTip = false;
             let source: CancellationTokenSource | undefined;
             attrs = {
                 ...attrs,
-                'data-for': this.tooltipService.tooltipId,
                 onMouseLeave: () => source?.cancel(),
-                onMouseEnter: async () => {
+                onMouseEnter: async event => {
                     if (configuredTip) {
+                        if (MarkdownString.is(node.tooltip)) {
+                            this.hoverService.requestHover({
+                                content: node.tooltip,
+                                target: event.target as HTMLElement,
+                                position: 'right'
+                            });
+                        }
                         return;
                     }
                     if (!node.resolved) {
@@ -500,27 +490,31 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
                             return;
                         }
                     }
-                    if (elementRef.current) {
-                        // Set the resolved tooltip. After an HTML element was created data-* properties must be accessed via the dataset
-                        elementRef.current.dataset.tip = MarkdownString.is(node.tooltip) ? this.markdownIt.render(node.tooltip.value) : node.tooltip;
-                        this.tooltipService.update();
-                        configuredTip = true;
-                        // Manually fire another mouseenter event to get react-tooltip to update the tooltip content.
-                        // Without this, the resolved tooltip is only shown after re-entering the tree item with the mouse.
-                        elementRef.current.dispatchEvent(new MouseEvent('mouseenter'));
+                    if (MarkdownString.is(node.tooltip)) {
+                        this.hoverService.requestHover({
+                            content: node.tooltip,
+                            target: event.target as HTMLElement,
+                            position: 'right'
+                        });
                     } else {
-                        console.error(`Could not set resolved tooltip for tree node '${node.id}' because its React Ref was not set.`);
+                        const title = node.tooltip ||
+                            (node.resourceUri && this.labelProvider.getLongName(new CoreURI(node.resourceUri)))
+                            || this.toNodeName(node);
+                        event.currentTarget.title = title;
                     }
+                    configuredTip = true;
                 }
             };
         } else if (MarkdownString.is(node.tooltip)) {
-            // Render markdown in custom tooltip
-            const tooltip = this.markdownIt.render(node.tooltip.value);
-
             attrs = {
                 ...attrs,
-                'data-tip': tooltip,
-                'data-for': this.tooltipService.tooltipId
+                onMouseEnter: event => {
+                    this.hoverService.requestHover({
+                        content: node.tooltip!,
+                        target: event.target as HTMLElement,
+                        position: 'right'
+                    });
+                }
             };
         } else {
             const title = node.tooltip ||
@@ -549,7 +543,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         if (description) {
             children.push(<span className='theia-tree-view-description'>{description}</span>);
         }
-        return <div {...attrs} ref={elementRef}>{...children}</div>;
+        return <div {...attrs}>{...children}</div>;
     }
 
     protected override renderTailDecorations(node: TreeViewNode, props: NodeProps): React.ReactNode {
@@ -666,9 +660,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     }
 
     protected override render(): React.ReactNode {
-        const node = React.createElement('div', this.createContainerAttributes(), this.renderSearchInfo(), this.renderTree(this.model));
-        this.tooltipService.update();
-        return node;
+        return React.createElement('div', this.createContainerAttributes(), this.renderSearchInfo(), this.renderTree(this.model));
     }
 
     protected renderSearchInfo(): React.ReactNode {
@@ -681,4 +673,33 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     override shouldShowWelcomeView(): boolean {
         return (this.model.proxy === undefined || this.model.isTreeEmpty) && this.message === undefined;
     }
+
+    protected override handleContextMenuEvent(node: TreeNode | undefined, event: React.MouseEvent<HTMLElement, MouseEvent>): void {
+        if (SelectableTreeNode.is(node)) {
+            // Keep the selection for the context menu, if the widget support multi-selection and the right click happens on an already selected node.
+            if (!this.props.multiSelect || !node.selected) {
+                const type = !!this.props.multiSelect && this.hasCtrlCmdMask(event) ? TreeSelection.SelectionType.TOGGLE : TreeSelection.SelectionType.DEFAULT;
+                this.model.addSelection({ node, type });
+            }
+            this.focusService.setFocus(node);
+            const contextMenuPath = this.props.contextMenuPath;
+            if (contextMenuPath) {
+                const { x, y } = event.nativeEvent;
+                const args = this.toContextMenuArgs(node);
+                const contextKeyService = this.contextKeyService.createOverlay([
+                    ['viewItem', (TreeViewNode.is(node) && node.contextValue) || undefined],
+                    ['view', this.identifier.id]
+                ]);
+                setTimeout(() => this.contextMenuRenderer.render({
+                    menuPath: contextMenuPath,
+                    anchor: { x, y },
+                    args,
+                    contextKeyService,
+                    onHide: () => contextKeyService.dispose(),
+                }), 10);
+            }
+        }
+        event.stopPropagation();
+        event.preventDefault();
+    }
 }

package/src/main/browser/view/tree-views-main.ts

@@ -163,14 +163,7 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
         }));
 
         this.toDispose.push(treeViewWidget.model.onSelectionChanged(event => {
-            if (event.length === 1) {
-                const { contextValue } = event[0] as TreeViewNode;
-                this.contextKeys.viewItem.set(contextValue);
-            } else {
-                this.contextKeys.viewItem.set('');
-            }
             this.contextKeys.view.set(treeViewId);
-
             this.proxy.$setSelection(treeViewId, event.map((node: TreeViewNode) => node.id));
         }));
 

package/src/plugin/languages.ts

@@ -520,7 +520,8 @@ export class LanguagesExtImpl implements LanguagesExt {
         return this.createDisposable(callId, disposables?.dispose);
     }
 
-    $provideCodeActions(handle: number,
+    $provideCodeActions(
+        handle: number,
         resource: UriComponents,
         rangeOrSelection: Range | Selection,
         context: CodeActionContext,