@theia/plugin-ext 1.70.0-next.7 → 1.70.0-next.71

package/src/hosted/node/scanners/scanner-theia.spec.ts

@@ -0,0 +1,112 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import { expect } from 'chai';
+import * as os from 'os';
+import * as path from 'path';
+import * as fs from 'fs';
+import { AbstractPluginScanner } from './scanner-theia';
+import { PluginPackage, PluginEntryPoint } from '../../../common/plugin-protocol';
+import URI from '@theia/core/lib/common/uri';
+
+class TestPluginScanner extends AbstractPluginScanner {
+    constructor() {
+        // Use a dummy api type; no backend init path needed
+        super('theiaPlugin' as any);
+    }
+
+    protected getEntryPoint(_plugin: PluginPackage): PluginEntryPoint {
+        return { backend: 'main.js' };
+    }
+}
+
+function createMinimalPluginPackage(
+    capabilities?: PluginPackage['capabilities'],
+    packagePath?: string
+): PluginPackage {
+    return {
+        name: 'test-plugin',
+        publisher: 'test-publisher',
+        version: '1.0.0',
+        engines: { theiaPlugin: '1.0.0' },
+        displayName: 'Test Plugin',
+        description: 'A test plugin',
+        packagePath: packagePath ?? os.tmpdir(),
+        capabilities
+    } as PluginPackage;
+}
+
+describe('AbstractPluginScanner', () => {
+    let scanner: TestPluginScanner;
+    let tmpDir: string;
+
+    before(() => {
+        scanner = new TestPluginScanner();
+        // Inject a mock pluginUriFactory
+        (scanner as any).pluginUriFactory = {
+            createUri: (_pkg: PluginPackage, _relativePath?: string) => new URI('file:///dummy')
+        };
+        // Create a real temp directory so readdirSync in getLicenseUrl/getReadmeUrl works
+        tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'scanner-test-'));
+    });
+
+    after(() => {
+        fs.rmSync(tmpDir, { recursive: true, force: true });
+    });
+
+    it('should set untrustedWorkspacesSupport to false when capabilities.untrustedWorkspaces.supported is false', () => {
+        const pkg = createMinimalPluginPackage({
+            untrustedWorkspaces: { supported: false }
+        }, tmpDir);
+
+        const model = scanner.getModel(pkg);
+        expect(model.untrustedWorkspacesSupport).to.equal(false);
+    });
+
+    it('should set untrustedWorkspacesSupport to true when capabilities.untrustedWorkspaces.supported is true', () => {
+        const pkg = createMinimalPluginPackage({
+            untrustedWorkspaces: { supported: true }
+        }, tmpDir);
+
+        const model = scanner.getModel(pkg);
+        expect(model.untrustedWorkspacesSupport).to.equal(true);
+    });
+
+    it('should set untrustedWorkspacesSupport to "limited" when capabilities.untrustedWorkspaces.supported is "limited"', () => {
+        const pkg = createMinimalPluginPackage({
+            untrustedWorkspaces: { supported: 'limited' }
+        }, tmpDir);
+
+        const model = scanner.getModel(pkg);
+        expect(model.untrustedWorkspacesSupport).to.equal('limited');
+    });
+
+    it('should leave untrustedWorkspacesSupport undefined when no capabilities field is present', () => {
+        const pkg = createMinimalPluginPackage(undefined, tmpDir);
+
+        const model = scanner.getModel(pkg);
+        expect(model.untrustedWorkspacesSupport).to.equal(undefined);
+    });
+
+    it('should leave untrustedWorkspacesSupport undefined when capabilities has no untrustedWorkspaces', () => {
+        const pkg = createMinimalPluginPackage({} as any, tmpDir);
+
+        const model = scanner.getModel(pkg);
+        expect(model.untrustedWorkspacesSupport).to.equal(undefined);
+    });
+});

package/src/hosted/node/scanners/scanner-theia.ts

@@ -177,9 +177,17 @@ export abstract class AbstractPluginScanner implements PluginScanner {
             licenseUrl: this.getLicenseUrl(plugin),
             readmeUrl: this.getReadmeUrl(plugin)
         };
+        this.applyTrustExtraction(plugin, result);
         return result;
     }
 
+    protected applyTrustExtraction(plugin: PluginPackage, result: PluginModel): void {
+        const untrustedWorkspacesSupport = plugin.capabilities?.untrustedWorkspaces?.supported;
+        if (untrustedWorkspacesSupport !== undefined) {
+            result.untrustedWorkspacesSupport = untrustedWorkspacesSupport;
+        }
+    }
+
     protected getReadmeUrl(plugin: PluginPackage): string | undefined {
         return this.getPluginRootFileUrl(plugin, ['readme.md', 'readme.txt', 'readme']);
     }

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

@@ -87,15 +87,6 @@ import { CodeActionTriggerKind } from '../../plugin/types-impl';
 import { IReadonlyVSDataTransfer } from '@theia/monaco-editor-core/esm/vs/base/common/dataTransfer';
 import { FileUploadService } from '@theia/filesystem/lib/common/upload/file-upload';
 
-/**
- * @monaco-uplift The public API declares these functions as (languageId: string, service).
- * Confirm that the functions delegate to a handler that accepts a LanguageSelector rather than just a string.
- * Relevant code in node_modules/@theia/monaco-editor-core/src/vs/editor/standalone/browser/standaloneLanguages.ts
- */
-interface RegistrationFunction<T> {
-    (languageId: MonacoLanguageSelector.LanguageSelector, service: T): Disposable;
-}
-
 @injectable()
 export class LanguagesMainImpl implements LanguagesMain, Disposable {
 
@@ -161,8 +152,13 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     }
 
     $setLanguageConfiguration(handle: number, languageId: string, configuration: SerializedLanguageConfiguration): void {
+        const comments = configuration.comments;
         const config: monaco.languages.LanguageConfiguration = {
-            comments: configuration.comments,
+            comments: comments ? {
+                // @monaco-uplift: Monaco doesn't support LineCommentRule yet, extract the string
+                lineComment: comments.lineComment && typeof comments.lineComment === 'object' ? comments.lineComment.comment : comments.lineComment,
+                blockComment: comments.blockComment,
+            } : undefined,
             brackets: configuration.brackets,
             wordPattern: reviveRegExp(configuration.wordPattern),
             indentationRules: reviveIndentationRule(configuration.indentationRules),
@@ -175,7 +171,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
 
     $registerCompletionSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], triggerCharacters: string[], supportsResolveDetails: boolean): void {
         this.register(handle,
-            (monaco.languages.registerCompletionItemProvider as RegistrationFunction<monaco.languages.CompletionItemProvider>)(this.toLanguageSelector(selector), {
+            monaco.languages.registerCompletionItemProvider(this.toLanguageSelector(selector), {
                 triggerCharacters,
                 provideCompletionItems: (model, position, context, token) => this.provideCompletionItems(handle, model, position, context, token),
                 resolveCompletionItem: supportsResolveDetails
@@ -214,19 +210,19 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerDefinitionProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const definitionProvider = this.createDefinitionProvider(handle);
-        this.register(handle, (monaco.languages.registerDefinitionProvider as RegistrationFunction<monaco.languages.DefinitionProvider>)(languageSelector, definitionProvider));
+        this.register(handle, monaco.languages.registerDefinitionProvider(languageSelector, definitionProvider));
     }
 
     $registerDeclarationProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const declarationProvider = this.createDeclarationProvider(handle);
-        this.register(handle, (monaco.languages.registerDeclarationProvider as RegistrationFunction<monaco.languages.DeclarationProvider>)(languageSelector, declarationProvider));
+        this.register(handle, monaco.languages.registerDeclarationProvider(languageSelector, declarationProvider));
     }
 
     $registerReferenceProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const referenceProvider = this.createReferenceProvider(handle);
-        this.register(handle, (monaco.languages.registerReferenceProvider as RegistrationFunction<monaco.languages.ReferenceProvider>)(languageSelector, referenceProvider));
+        this.register(handle, monaco.languages.registerReferenceProvider(languageSelector, referenceProvider));
     }
 
     protected createReferenceProvider(handle: number): monaco.languages.ReferenceProvider {
@@ -257,8 +253,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerSignatureHelpProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], metadata: theia.SignatureHelpProviderMetadata): void {
         const languageSelector = this.toLanguageSelector(selector);
         const signatureHelpProvider = this.createSignatureHelpProvider(handle, metadata);
-        this.register(handle, (monaco.languages.registerSignatureHelpProvider as RegistrationFunction<monaco.languages.SignatureHelpProvider>)
-            (languageSelector, signatureHelpProvider));
+        this.register(handle, monaco.languages.registerSignatureHelpProvider(languageSelector, signatureHelpProvider));
     }
 
     $clearDiagnostics(id: string): void {
@@ -277,8 +272,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerImplementationProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const implementationProvider = this.createImplementationProvider(handle);
-        this.register(handle, (monaco.languages.registerImplementationProvider as RegistrationFunction<monaco.languages.ImplementationProvider>)
-            (languageSelector, implementationProvider));
+        this.register(handle, monaco.languages.registerImplementationProvider(languageSelector, implementationProvider));
     }
 
     protected createImplementationProvider(handle: number): monaco.languages.ImplementationProvider {
@@ -314,8 +308,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerTypeDefinitionProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const typeDefinitionProvider = this.createTypeDefinitionProvider(handle);
-        this.register(handle, (monaco.languages.registerTypeDefinitionProvider as RegistrationFunction<monaco.languages.TypeDefinitionProvider>)
-            (languageSelector, typeDefinitionProvider));
+        this.register(handle, monaco.languages.registerTypeDefinitionProvider(languageSelector, typeDefinitionProvider));
     }
 
     protected createTypeDefinitionProvider(handle: number): monaco.languages.TypeDefinitionProvider {
@@ -351,7 +344,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerHoverProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const hoverProvider = this.createHoverProvider(handle);
-        this.register(handle, (monaco.languages.registerHoverProvider as RegistrationFunction<monaco.languages.HoverProvider>)(languageSelector, hoverProvider));
+        this.register(handle, monaco.languages.registerHoverProvider(languageSelector, hoverProvider));
     }
 
     protected createHoverProvider(handle: number): monaco.languages.HoverProvider {
@@ -375,7 +368,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         const languageSelector = this.toLanguageSelector(selector);
         const evaluatableExpressionProvider = this.createEvaluatableExpressionProvider(handle);
         this.register(handle,
-            (StandaloneServices.get(ILanguageFeaturesService).evaluatableExpressionProvider.register as RegistrationFunction<EvaluatableExpressionProvider>)
+            (StandaloneServices.get(ILanguageFeaturesService).evaluatableExpressionProvider.register)
                 (languageSelector, evaluatableExpressionProvider));
     }
 
@@ -394,7 +387,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         const languageSelector = this.toLanguageSelector(selector);
         const inlineValuesProvider = this.createInlineValuesProvider(handle);
         this.register(handle,
-            (StandaloneServices.get(ILanguageFeaturesService).inlineValuesProvider.register as RegistrationFunction<InlineValuesProvider>)
+            (StandaloneServices.get(ILanguageFeaturesService).inlineValuesProvider.register)
                 (languageSelector, inlineValuesProvider));
     }
 
@@ -420,8 +413,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerDocumentHighlightProvider(handle: number, _pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const documentHighlightProvider = this.createDocumentHighlightProvider(handle);
-        this.register(handle, (monaco.languages.registerDocumentHighlightProvider as RegistrationFunction<monaco.languages.DocumentHighlightProvider>)
-            (languageSelector, documentHighlightProvider));
+        this.register(handle, monaco.languages.registerDocumentHighlightProvider(languageSelector, documentHighlightProvider));
     }
 
     protected createDocumentHighlightProvider(handle: number): monaco.languages.DocumentHighlightProvider {
@@ -476,7 +468,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerDocumentLinkProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const linkProvider = this.createLinkProvider(handle);
-        this.register(handle, (monaco.languages.registerLinkProvider as RegistrationFunction<monaco.languages.LinkProvider>)(languageSelector, linkProvider));
+        this.register(handle, monaco.languages.registerLinkProvider(languageSelector, linkProvider));
     }
 
     protected createLinkProvider(handle: number): monaco.languages.LinkProvider {
@@ -525,7 +517,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
             lensProvider.onDidChange = emitter.event;
         }
 
-        this.register(handle, (monaco.languages.registerCodeLensProvider as RegistrationFunction<monaco.languages.CodeLensProvider>)(languageSelector, lensProvider));
+        this.register(handle, monaco.languages.registerCodeLensProvider(languageSelector, lensProvider));
     }
 
     protected createCodeLensProvider(handle: number): monaco.languages.CodeLensProvider {
@@ -567,7 +559,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerOutlineSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], displayName?: string): void {
         const languageSelector = this.toLanguageSelector(selector);
         const symbolProvider = this.createDocumentSymbolProvider(handle, displayName);
-        this.register(handle, (monaco.languages.registerDocumentSymbolProvider as RegistrationFunction<monaco.languages.DocumentSymbolProvider>)(languageSelector, symbolProvider));
+        this.register(handle, monaco.languages.registerDocumentSymbolProvider(languageSelector, symbolProvider));
     }
 
     protected createDocumentSymbolProvider(handle: number, displayName?: string): monaco.languages.DocumentSymbolProvider {
@@ -672,8 +664,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerDocumentFormattingSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const documentFormattingEditSupport = this.createDocumentFormattingSupport(handle, pluginInfo);
-        this.register(handle, (monaco.languages.registerDocumentFormattingEditProvider as RegistrationFunction<monaco.languages.DocumentFormattingEditProvider>)
-            (languageSelector, documentFormattingEditSupport));
+        this.register(handle, monaco.languages.registerDocumentFormattingEditProvider(languageSelector, documentFormattingEditSupport));
     }
 
     createDocumentFormattingSupport(handle: number, pluginInfo: PluginInfo): monaco.languages.DocumentFormattingEditProvider {
@@ -695,8 +686,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerRangeFormattingSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const rangeFormattingEditProvider = this.createRangeFormattingSupport(handle, pluginInfo);
-        this.register(handle, (monaco.languages.registerDocumentRangeFormattingEditProvider as RegistrationFunction<monaco.languages.DocumentRangeFormattingEditProvider>)
-            (languageSelector, rangeFormattingEditProvider));
+        this.register(handle, monaco.languages.registerDocumentRangeFormattingEditProvider(languageSelector, rangeFormattingEditProvider));
     }
 
     createRangeFormattingSupport(handle: number, pluginInfo: PluginInfo): monaco.languages.DocumentRangeFormattingEditProvider {
@@ -718,8 +708,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerOnTypeFormattingProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], autoFormatTriggerCharacters: string[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const onTypeFormattingProvider = this.createOnTypeFormattingProvider(handle, autoFormatTriggerCharacters);
-        this.register(handle, (monaco.languages.registerOnTypeFormattingEditProvider as RegistrationFunction<monaco.languages.OnTypeFormattingEditProvider>)
-            (languageSelector, onTypeFormattingProvider));
+        this.register(handle, monaco.languages.registerOnTypeFormattingEditProvider(languageSelector, onTypeFormattingProvider));
     }
 
     protected createOnTypeFormattingProvider(
@@ -747,11 +736,9 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         );
     }
 
-    createDocumentDropEditProvider(handle: number, _metadata?: DocumentDropEditProviderMetadata): DocumentDropEditProvider {
+    createDocumentDropEditProvider(handle: number, metadata?: DocumentDropEditProviderMetadata): DocumentDropEditProvider {
         return {
-            // @monaco-uplift id and dropMimeTypes should be supported by the monaco drop editor provider after 1.82.0
-            // id?: string;
-            // dropMimeTypes: metadata?.dropMimeTypes ?? ['*/*'],
+            dropMimeTypes: metadata?.dropMimeTypes ?? ['*/*'],
             provideDocumentDropEdits: async (model, position, dataTransfer, token) => this.provideDocumentDropEdits(handle, model, position, dataTransfer, token)
         };
     }
@@ -772,7 +759,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
             provider.onDidChange = emitter.event;
         }
 
-        this.register(handle, (monaco.languages.registerFoldingRangeProvider as RegistrationFunction<monaco.languages.FoldingRangeProvider>)(languageSelector, provider));
+        this.register(handle, monaco.languages.registerFoldingRangeProvider(languageSelector, provider));
     }
 
     createFoldingRangeProvider(handle: number): monaco.languages.FoldingRangeProvider {
@@ -796,7 +783,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerSelectionRangeProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const provider = this.createSelectionRangeProvider(handle);
-        this.register(handle, (monaco.languages.registerSelectionRangeProvider as RegistrationFunction<monaco.languages.SelectionRangeProvider>)(languageSelector, provider));
+        this.register(handle, monaco.languages.registerSelectionRangeProvider(languageSelector, provider));
     }
 
     protected createSelectionRangeProvider(handle: number): monaco.languages.SelectionRangeProvider {
@@ -813,7 +800,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerDocumentColorProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const colorProvider = this.createColorProvider(handle);
-        this.register(handle, (monaco.languages.registerColorProvider as RegistrationFunction<monaco.languages.DocumentColorProvider>)(languageSelector, colorProvider));
+        this.register(handle, monaco.languages.registerColorProvider(languageSelector, colorProvider));
     }
 
     createColorProvider(handle: number): monaco.languages.DocumentColorProvider {
@@ -864,7 +851,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
             this.register(eventHandle, emitter);
             inlayHintsProvider.onDidChangeInlayHints = emitter.event;
         }
-        this.register(handle, (monaco.languages.registerInlayHintsProvider as RegistrationFunction<monaco.languages.InlayHintsProvider>)(languageSelector, inlayHintsProvider));
+        this.register(handle, monaco.languages.registerInlayHintsProvider(languageSelector, inlayHintsProvider));
 
     }
 
@@ -923,11 +910,11 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
                 context: monaco.languages.InlineCompletionContext,
                 token: CancellationToken
             ): Promise<IdentifiableInlineCompletions | undefined> => this.proxy.$provideInlineCompletions(handle, model.uri, position, context, token),
-            freeInlineCompletions: (completions: IdentifiableInlineCompletions): void => {
+            disposeInlineCompletions: (completions: IdentifiableInlineCompletions): void => {
                 this.proxy.$freeInlineCompletionsList(handle, completions.pid);
             }
         };
-        this.register(handle, (monaco.languages.registerInlineCompletionsProvider as RegistrationFunction<monaco.languages.InlineCompletionsProvider>)(languageSelector, provider));
+        this.register(handle, monaco.languages.registerInlineCompletionsProvider(languageSelector, provider));
     }
 
     $registerQuickFixProvider(
@@ -1005,7 +992,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     $registerRenameProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], supportsResolveLocation: boolean): void {
         const languageSelector = this.toLanguageSelector(selector);
         const renameProvider = this.createRenameProvider(handle, supportsResolveLocation);
-        this.register(handle, (monaco.languages.registerRenameProvider as RegistrationFunction<monaco.languages.RenameProvider>)(languageSelector, renameProvider));
+        this.register(handle, monaco.languages.registerRenameProvider(languageSelector, renameProvider));
     }
 
     protected createRenameProvider(handle: number, supportsResolveLocation: boolean): monaco.languages.RenameProvider {
@@ -1140,12 +1127,12 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
             event = emitter.event;
         }
         const provider = this.createDocumentSemanticTokensProvider(handle, legend, event);
-        this.register(handle, (monaco.languages.registerDocumentSemanticTokensProvider as RegistrationFunction<monaco.languages.DocumentSemanticTokensProvider>)
-            (languageSelector, provider));
+        this.register(handle, monaco.languages.registerDocumentSemanticTokensProvider(languageSelector, provider));
     }
 
     protected createDocumentSemanticTokensProvider(handle: number, legend: theia.SemanticTokensLegend, event?: Event<void>): monaco.languages.DocumentSemanticTokensProvider {
         return {
+            onDidChange: event,
             releaseDocumentSemanticTokens: resultId => {
                 if (resultId) {
                     this.proxy.$releaseDocumentSemanticTokens(handle, parseInt(resultId, 10));
@@ -1193,14 +1180,14 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
             event = emitter.event;
         }
         const provider = this.createDocumentRangeSemanticTokensProvider(handle, legend, event);
-        this.register(handle, (monaco.languages.registerDocumentRangeSemanticTokensProvider as RegistrationFunction<monaco.languages.DocumentRangeSemanticTokensProvider>)
-            (languageSelector, provider));
+        this.register(handle, monaco.languages.registerDocumentRangeSemanticTokensProvider(languageSelector, provider));
     }
 
     protected createDocumentRangeSemanticTokensProvider(
-        handle: number, legend: theia.SemanticTokensLegend, _onDidChangeEvent?: Event<void>
+        handle: number, legend: theia.SemanticTokensLegend, event?: Event<void>
     ): monaco.languages.DocumentRangeSemanticTokensProvider {
         return {
+            onDidChange: event,
             getLegend: () => legend,
             provideDocumentRangeSemanticTokens: async (model, range, token) => {
                 const encodedDto = await this.proxy.$provideDocumentRangeSemanticTokens(handle, model.uri, range, token);
@@ -1219,7 +1206,6 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
                 }
                 throw new Error('Unexpected');
             },
-            // @monaco-uplift onDidChange property is not yet available with the current monaco version, probably with the next monaco update then
         };
     }
 
@@ -1251,7 +1237,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         const languageSelector = this.toLanguageSelector(selector);
         const linkedEditingRangeProvider = this.createLinkedEditingRangeProvider(handle);
         this.register(handle,
-            (monaco.languages.registerLinkedEditingRangeProvider as RegistrationFunction<monaco.languages.LinkedEditingRangeProvider>)(languageSelector, linkedEditingRangeProvider)
+            monaco.languages.registerLinkedEditingRangeProvider(languageSelector, linkedEditingRangeProvider)
         );
     }
 

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

@@ -22,6 +22,7 @@ import { MenuModelRegistry } from '@theia/core/lib/common';
 import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { DeployedPlugin, IconUrl, Menu } from '../../../common';
 import { ScmWidget } from '@theia/scm/lib/browser/scm-widget';
+import { ScmRepositoriesWidget, SCM_SOURCE_CONTROL_TITLE_MENU } from '@theia/scm/lib/browser/scm-repositories-widget';
 import { KeybindingRegistry, QuickCommandService, codicon } from '@theia/core/lib/browser';
 import {
     CodeEditorWidgetUtil, codeToTheiaMappings, ContributionPoint,
@@ -61,6 +62,7 @@ export class MenusContributionPointHandler {
             isVisible: widget => CodeEditorWidgetUtil.is(widget)
         });
         this.tabBarToolbar.registerMenuDelegate(PLUGIN_SCM_TITLE_MENU, widget => widget instanceof ScmWidget);
+        this.tabBarToolbar.registerMenuDelegate(SCM_SOURCE_CONTROL_TITLE_MENU, widget => widget instanceof ScmRepositoriesWidget);
         this.tabBarToolbar.registerMenuDelegate(PLUGIN_VIEW_TITLE_MENU, widget => !CodeEditorWidgetUtil.is(widget));
     }
 

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

@@ -70,6 +70,9 @@ export class PluginMenuCommandAdapter {
             ['scm/resourceGroup/context', toScmArgs],
             ['scm/resourceState/context', toScmArgs],
             ['scm/title', () => [this.toScmArg(this.scmService.selectedRepository)]],
+            ['scm/sourceControl', toScmArgs],
+            ['scm/sourceControl/context', toScmArgs],
+            ['scm/sourceControl/title', () => [this.toScmArg(this.scmService.selectedRepository)]],
             ['testing/message/context', toTestMessageArgs],
             ['testing/profiles/context', noArgs],
             ['scm/change/title', (...args) => this.toScmChangeArgs(...args)],

package/src/main/browser/menus/vscode-theia-menu-mappings.ts

@@ -26,6 +26,9 @@ import { EditorWidget, EDITOR_CONTEXT_MENU, EDITOR_CONTENT_MENU } from '@theia/e
 import { NAVIGATOR_CONTEXT_MENU } from '@theia/navigator/lib/browser/navigator-contribution';
 import { ScmTreeWidget } from '@theia/scm/lib/browser/scm-tree-widget';
 import { PLUGIN_SCM_CHANGE_TITLE_MENU } from '@theia/scm/lib/browser/dirty-diff/dirty-diff-widget';
+import {
+    SCM_SOURCE_CONTROL_CONTEXT_MENU, SCM_SOURCE_CONTROL_MENU, SCM_SOURCE_CONTROL_TITLE_MENU, SCM_TITLE_MENU
+} from '@theia/scm/lib/browser/scm-repositories-widget';
 import { TIMELINE_ITEM_CONTEXT_MENU } from '@theia/timeline/lib/browser/timeline-tree-widget';
 import { COMMENT_CONTEXT, COMMENT_THREAD_CONTEXT, COMMENT_TITLE } from '../comments/comment-thread-widget';
 import { VIEW_ITEM_CONTEXT_MENU } from '../view/tree-view-widget';
@@ -37,7 +40,8 @@ import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-con
 
 export const PLUGIN_EDITOR_TITLE_MENU = ['plugin_editor/title'];
 export const PLUGIN_EDITOR_TITLE_RUN_MENU = ['plugin_editor/title/run'];
-export const PLUGIN_SCM_TITLE_MENU = ['plugin_scm/title'];
+/** @deprecated Use SCM_TITLE_MENU from @theia/scm/lib/browser/scm-repositories-widget */
+export const PLUGIN_SCM_TITLE_MENU = SCM_TITLE_MENU;
 export const PLUGIN_VIEW_TITLE_MENU = ['plugin_view/title'];
 
 export const implementedVSCodeContributionPoints = [
@@ -58,6 +62,9 @@ export const implementedVSCodeContributionPoints = [
     'scm/resourceFolder/context',
     'scm/resourceGroup/context',
     'scm/resourceState/context',
+    'scm/sourceControl',
+    'scm/sourceControl/context',
+    'scm/sourceControl/title',
     'scm/title',
     'timeline/item/context',
     'testing/item/context',
@@ -93,7 +100,10 @@ export const codeToTheiaMappings = new Map<string, MenuPath[]>([
     ['scm/resourceFolder/context', [ScmTreeWidget.RESOURCE_FOLDER_CONTEXT_MENU]],
     ['scm/resourceGroup/context', [ScmTreeWidget.RESOURCE_GROUP_CONTEXT_MENU]],
     ['scm/resourceState/context', [ScmTreeWidget.RESOURCE_CONTEXT_MENU]],
-    ['scm/title', [PLUGIN_SCM_TITLE_MENU]],
+    ['scm/sourceControl', [SCM_SOURCE_CONTROL_MENU]],
+    ['scm/sourceControl/context', [SCM_SOURCE_CONTROL_CONTEXT_MENU]],
+    ['scm/sourceControl/title', [SCM_SOURCE_CONTROL_TITLE_MENU]],
+    ['scm/title', [SCM_TITLE_MENU]],
     ['testing/item/context', [TEST_VIEW_CONTEXT_MENU]],
     ['testing/message/context', [TEST_RUNS_CONTEXT_MENU]],
     ['testing/profiles/context', [PLUGIN_TEST_VIEW_TITLE_MENU]],

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

@@ -209,11 +209,16 @@ export class PluginContributionHandler {
                 }
                 const langConfiguration = lang.configuration;
                 if (langConfiguration) {
+                    const comments = langConfiguration.comments;
                     pushContribution(`language.${lang.id}.configuration`, () => monaco.languages.setLanguageConfiguration(lang.id, {
                         wordPattern: this.createRegex(langConfiguration.wordPattern),
                         autoClosingPairs: langConfiguration.autoClosingPairs,
                         brackets: langConfiguration.brackets,
-                        comments: langConfiguration.comments,
+                        // @monaco-uplift: Monaco doesn't support LineCommentRule yet, extract the string
+                        comments: comments ? {
+                            lineComment: comments.lineComment && typeof comments.lineComment === 'object' ? comments.lineComment.comment : comments.lineComment,
+                            blockComment: comments.blockComment,
+                        } : undefined,
                         folding: this.convertFolding(langConfiguration.folding),
                         surroundingPairs: langConfiguration.surroundingPairs,
                         indentationRules: this.convertIndentationRules(langConfiguration.indentationRules),

package/src/main/browser/plugin-ext-frontend-module.ts

@@ -26,7 +26,7 @@ import {
     noopWidgetStatusBarContribution,
     WidgetStatusBarContribution
 } from '@theia/core/lib/browser';
-import { MaybePromise, CommandContribution, ResourceResolver, bindRootContributionProvider, URI, generateUuid, PreferenceContribution } from '@theia/core/lib/common';
+import { MaybePromise, CommandContribution, ResourceResolver, bindRootContributionProvider, URI, generateUuid, PreferenceContribution, nls } from '@theia/core/lib/common';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging';
 import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
 import { HostedPluginWatcher } from '../../hosted/browser/hosted-plugin-watcher';
@@ -91,8 +91,10 @@ import { WebviewSecondaryWindowSupport } from './webview/webview-secondary-windo
 import { CustomEditorUndoRedoHandler } from './custom-editors/custom-editor-undo-redo-handler';
 import { CustomEditorNavigationContribution } from './custom-editors/custom-editor-navigation-contribution';
 import { bindWebviewPreferences } from '../common/webview-preferences';
+import { bindPluginHostEnvironmentPreferences } from '../common/plugin-host-environment-preferences';
 import { WebviewFrontendPreferenceContribution } from './webview/webview-frontend-preference-contribution';
 import { PluginExtToolbarItemArgumentProcessor } from './plugin-ext-argument-processor';
+import { WorkspaceRestriction, WorkspaceRestrictionContribution } from '@theia/workspace/lib/browser/workspace-trust-service';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
@@ -183,6 +185,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     })).inSingletonScope();
 
     bindWebviewPreferences(bind);
+    bindPluginHostEnvironmentPreferences(bind);
     bind(WebviewFrontendPreferenceContribution).toSelf().inSingletonScope();
     bind(PreferenceContribution).toService(WebviewFrontendPreferenceContribution);
     bind(WebviewEnvironment).toSelf().inSingletonScope();
@@ -298,4 +301,31 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(PluginExtToolbarItemArgumentProcessor).toSelf().inSingletonScope();
     bind(ArgumentProcessorContribution).toService(PluginExtToolbarItemArgumentProcessor);
 
+    bind(WorkspaceRestrictionContribution).toDynamicValue(ctx => {
+        const hostedPlugin = ctx.container.get(HostedPluginSupport);
+        return {
+            getRestrictions(): WorkspaceRestriction[] {
+                if (hostedPlugin.disabledByTrust.size === 0) {
+                    return [];
+                }
+                return [{
+                    label: nls.localize('theia/plugin-ext/extensionsRestrictedMode',
+                        'Some extensions are disabled in Restricted Mode'),
+                    details: Array.from(hostedPlugin.disabledByTrust)
+                }];
+            },
+            requiresReloadOnTrustChange(newTrust: boolean): boolean {
+                if (newTrust) {
+                    // Granting trust: reload only if plugins were actually blocked.
+                    return hostedPlugin.disabledByTrust.size > 0;
+                }
+                // Revoking trust: reload only if any loaded plugin declares supported: false,
+                // meaning it must be stopped now that the workspace is no longer trusted.
+                return hostedPlugin.plugins.some(
+                    p => p.model.untrustedWorkspacesSupport === false
+                );
+            }
+        };
+    }).inSingletonScope();
+
 });

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

@@ -17,7 +17,7 @@
 import * as React from '@theia/core/shared/react';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import { Message } from '@theia/core/shared/@lumino/messaging';
-import { PluginMetadata } from '../../common/plugin-protocol';
+import { PluginIdentifiers, PluginMetadata } from '../../common/plugin-protocol';
 import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
 import { AlertMessage } from '@theia/core/lib/browser/widgets/alert-message';
 import { HostedPluginSupport, PluginProgressLocation } from '../../hosted/browser/hosted-plugin';
@@ -26,7 +26,7 @@ import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { codicon } from '@theia/core/lib/browser';
 import { nls } from '@theia/core/lib/common';
 
-export const PLUGINS_LABEL = nls.localize('theia/plugin-ext/plugins', 'Plugins');
+export const PLUGINS_LABEL = nls.localizeByDefault('Plugins');
 
 @injectable()
 export class PluginWidget extends ReactWidget {
@@ -87,11 +87,18 @@ export class PluginWidget extends ReactWidget {
     }
 
     private renderPlugin(plugin: PluginMetadata): JSX.Element {
-        return <div key={plugin.model.name} className={this.createPluginClassName(plugin)}>
+        const unversionedId = PluginIdentifiers.componentsToUnversionedId(plugin.model);
+        const isRestrictedByTrust = this.pluginService.disabledByTrust.has(unversionedId);
+        return <div key={plugin.model.name} className={this.createPluginClassName(plugin, isRestrictedByTrust)}>
             <div className='column flexcontainer pluginInformationContainer'>
                 <div className='row flexcontainer'>
                     <div className={codicon('list-selection')}></div>
                     <div title={plugin.model.name} className='pluginName noWrapInfo'>{plugin.model.name}</div>
+                    {isRestrictedByTrust && (
+                        <span className='pluginRestrictedBadge' title={nls.localizeByDefault('Disabled in Restricted Mode')}>
+                            {nls.localizeByDefault('Restricted Mode')}
+                        </span>
+                    )}
                 </div>
                 <div className='row flexcontainer'>
                     <div className='pluginVersion'>{plugin.model.version}</div>
@@ -106,8 +113,11 @@ export class PluginWidget extends ReactWidget {
         </div>;
     }
 
-    protected createPluginClassName(plugin: PluginMetadata): string {
+    protected createPluginClassName(plugin: PluginMetadata, isRestrictedByTrust: boolean = false): string {
         const classNames = ['pluginHeaderContainer'];
+        if (isRestrictedByTrust) {
+            classNames.push('pluginDisabledByTrust');
+        }
         return classNames.join(' ');
     }