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

package/package.json

@@ -1,38 +1,38 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.70.0-next.61+d13baea89",
+  "version": "1.70.0-next.71+7ece9ea62",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/ai-mcp": "1.70.0-next.61+d13baea89",
-    "@theia/bulk-edit": "1.70.0-next.61+d13baea89",
-    "@theia/callhierarchy": "1.70.0-next.61+d13baea89",
-    "@theia/console": "1.70.0-next.61+d13baea89",
-    "@theia/core": "1.70.0-next.61+d13baea89",
-    "@theia/debug": "1.70.0-next.61+d13baea89",
-    "@theia/editor": "1.70.0-next.61+d13baea89",
-    "@theia/editor-preview": "1.70.0-next.61+d13baea89",
-    "@theia/file-search": "1.70.0-next.61+d13baea89",
-    "@theia/filesystem": "1.70.0-next.61+d13baea89",
-    "@theia/markers": "1.70.0-next.61+d13baea89",
-    "@theia/messages": "1.70.0-next.61+d13baea89",
-    "@theia/monaco": "1.70.0-next.61+d13baea89",
+    "@theia/ai-mcp": "1.70.0-next.71+7ece9ea62",
+    "@theia/bulk-edit": "1.70.0-next.71+7ece9ea62",
+    "@theia/callhierarchy": "1.70.0-next.71+7ece9ea62",
+    "@theia/console": "1.70.0-next.71+7ece9ea62",
+    "@theia/core": "1.70.0-next.71+7ece9ea62",
+    "@theia/debug": "1.70.0-next.71+7ece9ea62",
+    "@theia/editor": "1.70.0-next.71+7ece9ea62",
+    "@theia/editor-preview": "1.70.0-next.71+7ece9ea62",
+    "@theia/file-search": "1.70.0-next.71+7ece9ea62",
+    "@theia/filesystem": "1.70.0-next.71+7ece9ea62",
+    "@theia/markers": "1.70.0-next.71+7ece9ea62",
+    "@theia/messages": "1.70.0-next.71+7ece9ea62",
+    "@theia/monaco": "1.70.0-next.71+7ece9ea62",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/navigator": "1.70.0-next.61+d13baea89",
-    "@theia/notebook": "1.70.0-next.61+d13baea89",
-    "@theia/output": "1.70.0-next.61+d13baea89",
-    "@theia/plugin": "1.70.0-next.61+d13baea89",
-    "@theia/preferences": "1.70.0-next.61+d13baea89",
-    "@theia/scm": "1.70.0-next.61+d13baea89",
-    "@theia/search-in-workspace": "1.70.0-next.61+d13baea89",
-    "@theia/task": "1.70.0-next.61+d13baea89",
-    "@theia/terminal": "1.70.0-next.61+d13baea89",
-    "@theia/test": "1.70.0-next.61+d13baea89",
-    "@theia/timeline": "1.70.0-next.61+d13baea89",
-    "@theia/typehierarchy": "1.70.0-next.61+d13baea89",
-    "@theia/variable-resolver": "1.70.0-next.61+d13baea89",
-    "@theia/workspace": "1.70.0-next.61+d13baea89",
+    "@theia/navigator": "1.70.0-next.71+7ece9ea62",
+    "@theia/notebook": "1.70.0-next.71+7ece9ea62",
+    "@theia/output": "1.70.0-next.71+7ece9ea62",
+    "@theia/plugin": "1.70.0-next.71+7ece9ea62",
+    "@theia/preferences": "1.70.0-next.71+7ece9ea62",
+    "@theia/scm": "1.70.0-next.71+7ece9ea62",
+    "@theia/search-in-workspace": "1.70.0-next.71+7ece9ea62",
+    "@theia/task": "1.70.0-next.71+7ece9ea62",
+    "@theia/terminal": "1.70.0-next.71+7ece9ea62",
+    "@theia/test": "1.70.0-next.71+7ece9ea62",
+    "@theia/timeline": "1.70.0-next.71+7ece9ea62",
+    "@theia/typehierarchy": "1.70.0-next.71+7ece9ea62",
+    "@theia/variable-resolver": "1.70.0-next.71+7ece9ea62",
+    "@theia/workspace": "1.70.0-next.71+7ece9ea62",
     "@types/mime": "^2.0.1",
     "@vscode/debugprotocol": "^1.51.0",
     "@vscode/proxy-agent": "^0.13.2",
@@ -97,5 +97,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "d13baea893dbdfe4c1df677a9b00b11289e71fa7"
+  "gitHead": "7ece9ea6295b73ee1ac962e29d416cebf578d380"
 }

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

@@ -1037,7 +1037,7 @@ export interface DecorationsMain {
 }
 
 export interface ScmMain {
-    $registerSourceControl(sourceControlHandle: number, id: string, label: string, rootUri?: UriComponents): Promise<void>;
+    $registerSourceControl(sourceControlHandle: number, id: string, label: string, rootUri?: UriComponents, parentHandle?: number): Promise<void>;
     $updateSourceControl(sourceControlHandle: number, features: SourceControlProviderFeatures): Promise<void>;
     $unregisterSourceControl(sourceControlHandle: number): Promise<void>;
 
@@ -1062,6 +1062,7 @@ export interface SourceControlProviderFeatures {
     commitTemplate?: string;
     acceptInputCommand?: Command;
     statusBarCommands?: Command[];
+    contextValue?: string;
 }
 
 export interface SourceControlGroupFeatures {
@@ -1248,9 +1249,22 @@ export interface TextEditorPositionData {
     [id: string]: EditorPosition;
 }
 
+export interface TextEditorDiffInformationDto {
+    readonly documentVersion: number;
+    readonly original: UriComponents | undefined;
+    readonly modified: UriComponents;
+    readonly changes: readonly {
+        readonly original: { readonly startLineNumber: number; readonly endLineNumberExclusive: number };
+        readonly modified: { readonly startLineNumber: number; readonly endLineNumberExclusive: number };
+        readonly kind: number;
+    }[];
+    readonly isStale: boolean;
+}
+
 export interface TextEditorsExt {
     $acceptEditorPropertiesChanged(id: string, props: EditorChangedPropertiesData): void;
     $acceptEditorPositionData(data: TextEditorPositionData): void;
+    $acceptEditorDiffInformation(id: string, diffInformation: TextEditorDiffInformationDto[] | undefined): void;
 }
 
 export interface SingleEditOperation {
@@ -1502,8 +1516,13 @@ export interface OutputChannelRegistryMain {
 
 export type CharacterPair = [string, string];
 
+export interface LineCommentRule {
+    comment: string;
+    noIndent?: boolean;
+}
+
 export interface CommentRule {
-    lineComment?: string;
+    lineComment?: string | LineCommentRule;
     blockComment?: CharacterPair;
 }
 

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

@@ -152,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),

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-widget.tsx

@@ -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 {

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

@@ -120,6 +120,8 @@ export class PluginScmProvider implements ScmProvider {
 
     private features: SourceControlProviderFeatures = {};
 
+    get providerContextValue(): string | undefined { return this.features.contextValue; }
+
     get handle(): number { return this._handle; }
     get label(): string { return this._label; }
     get rootUri(): string { return this._rootUri ? this._rootUri.toString() : ''; }
@@ -164,7 +166,8 @@ export class PluginScmProvider implements ScmProvider {
         private readonly _contextValue: string,
         private readonly _label: string,
         private readonly _rootUri: vscodeURI | undefined,
-        private disposables: DisposableCollection
+        private disposables: DisposableCollection,
+        readonly parentHandle?: number
     ) { }
 
     updateSourceControl(features: SourceControlProviderFeatures): void {
@@ -330,17 +333,21 @@ export class ScmMainImpl implements ScmMain {
         this.disposables.dispose();
     }
 
-    async $registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined): Promise<void> {
-        const provider = new PluginScmProvider(this.proxy, this.colors, this.sharedStyle, handle, id, label, rootUri ? vscodeURI.revive(rootUri) : undefined, this.disposables);
+    async $registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined, parentHandle?: number): Promise<void> {
+        const provider = new PluginScmProvider(
+            this.proxy, this.colors, this.sharedStyle, handle, id, label,
+            rootUri ? vscodeURI.revive(rootUri) : undefined, this.disposables, parentHandle
+        );
+        const parentRepo = parentHandle !== undefined ? this.repositories.get(parentHandle) : undefined;
         const repository = this.scmService.registerScmProvider(provider, {
             input: {
                 validator: async value => {
                     const result = await this.proxy.$validateInput(handle, value, value.length);
                     return result && { message: result[0], type: result[1] };
                 }
-            }
-        }
-        );
+            },
+            parentRootUri: parentRepo?.provider.rootUri
+        });
         this.repositories.set(handle, repository);
 
         const disposables = new DisposableCollection(

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

@@ -147,6 +147,10 @@ export class TextEditorMain implements Disposable {
         return this.editor.diffInformation;
     }
 
+    getDiffEditor(): MonacoDiffEditor | undefined {
+        return this.editor instanceof MonacoDiffEditor ? this.editor : undefined;
+    }
+
     setSelections(selections: Selection[]): void {
         if (this.editor) {
             this.editor.getControl().setSelections(selections);

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

@@ -49,6 +49,11 @@ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/stan
 import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
 import { type ILineChange } from '@theia/monaco-editor-core/esm/vs/editor/common/diff/legacyLinesDiffComputer';
 import { ArrayUtils, URI } from '@theia/core';
+import { DiffUris } from '@theia/core/lib/browser/diff-uris';
+import { TextEditorChangeKind } from '../../plugin/types-impl';
+import { Change } from '@theia/scm/lib/browser/dirty-diff/diff-computer';
+import { DirtyDiffUpdate } from '@theia/scm/lib/browser/dirty-diff/dirty-diff-decorator';
+import { ScmDecorationsService } from '@theia/scm/lib/browser/decorations/scm-decorations-service';
 import { toNotebookWorspaceEdit } from './notebooks/notebooks-main';
 import { interfaces } from '@theia/core/shared/inversify';
 import { NotebookService } from '@theia/notebook/lib/browser';
@@ -62,6 +67,7 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
     private readonly bulkEditService: MonacoBulkEditService;
     private readonly notebookService: NotebookService;
+    private readonly scmDecorationsService: ScmDecorationsService;
 
     constructor(
         private readonly editorsAndDocuments: EditorsAndDocumentsMain,
@@ -73,10 +79,12 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
         this.bulkEditService = container.get(MonacoBulkEditService);
         this.notebookService = container.get(NotebookService);
+        this.scmDecorationsService = container.get(ScmDecorationsService);
 
         this.toDispose.push(editorsAndDocuments);
         this.toDispose.push(editorsAndDocuments.onTextEditorAdd(editors => editors.forEach(this.onTextEditorAdd, this)));
         this.toDispose.push(editorsAndDocuments.onTextEditorRemove(editors => editors.forEach(this.onTextEditorRemove, this)));
+        this.toDispose.push(this.scmDecorationsService.onDirtyDiffUpdate(update => this.onDirtyDiffUpdate(update)));
     }
 
     dispose(): void {
@@ -93,6 +101,130 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         );
         this.editorsToDispose.set(id, toDispose);
         this.toDispose.push(toDispose);
+
+        const diffEditor = editor.getDiffEditor();
+        if (diffEditor) {
+            const pushDiffEditorInfo = () => this.pushDiffEditorDiffInformation(id, editor);
+            toDispose.push(diffEditor.diffEditor.onDidUpdateDiff(pushDiffEditorInfo));
+            pushDiffEditorInfo();
+        }
+    }
+
+    private onDirtyDiffUpdate(update: DirtyDiffUpdate): void {
+        const editorUri = update.editor.uri.toString();
+        const editorIds = this.findEditorIdsByUri(editorUri, true);
+        if (editorIds.length === 0) {
+            return;
+        }
+
+        const originalUri = update.previousRevisionUri?.toComponents();
+
+        const changes = update.changes.map(change => {
+            let kind: TextEditorChangeKind;
+            if (Change.isAddition(change)) {
+                kind = TextEditorChangeKind.Addition;
+            } else if (Change.isRemoval(change)) {
+                kind = TextEditorChangeKind.Deletion;
+            } else {
+                kind = TextEditorChangeKind.Modification;
+            }
+            return {
+                original: {
+                    startLineNumber: change.previousRange.start + 1,
+                    endLineNumberExclusive: change.previousRange.end + 1
+                },
+                modified: {
+                    startLineNumber: change.currentRange.start + 1,
+                    endLineNumberExclusive: change.currentRange.end + 1
+                },
+                kind
+            };
+        });
+
+        // Push diff information to all editors with this URI (regular editors and diff editor modified sides).
+        for (const editorId of editorIds) {
+            const editor = this.editorsAndDocuments.getEditor(editorId);
+            if (!editor) {
+                continue;
+            }
+            const model = editor.getModel();
+            const modifiedUri = URI.fromComponents(model.uri).toComponents();
+            this.proxy.$acceptEditorDiffInformation(editorId, [{
+                documentVersion: model.getVersionId(),
+                original: originalUri,
+                modified: modifiedUri,
+                changes,
+                isStale: false
+            }]);
+        }
+    }
+
+    private pushDiffEditorDiffInformation(id: string, editor: TextEditorMain): void {
+        const diffEditor = editor.getDiffEditor();
+        if (!diffEditor) {
+            return;
+        }
+
+        let originalUri: UriComponents | undefined;
+        let modifiedUri: UriComponents;
+
+        try {
+            const [left, right] = DiffUris.decode(diffEditor.uri);
+            originalUri = left.toComponents();
+            modifiedUri = right.toComponents();
+        } catch {
+            // Not a valid DiffUri; fall back to model URIs
+            originalUri = new URI(diffEditor.originalModel.uri).toComponents();
+            modifiedUri = new URI(diffEditor.modifiedModel.uri).toComponents();
+        }
+
+        const lineChanges = diffEditor.diffInformation;
+
+        const changes = lineChanges.map(change => {
+            let kind: TextEditorChangeKind;
+            if (change.originalEndLineNumber === 0) {
+                kind = TextEditorChangeKind.Addition;
+            } else if (change.modifiedEndLineNumber === 0) {
+                kind = TextEditorChangeKind.Deletion;
+            } else {
+                kind = TextEditorChangeKind.Modification;
+            }
+
+            // ILineChange uses 1-based lines where 0 means empty range.
+            // TextEditorLineRange uses 1-based startLineNumber and endLineNumberExclusive.
+            const toLineRange = (start: number, end: number) => end === 0
+                ? { startLineNumber: start + 1, endLineNumberExclusive: start + 1 }
+                : { startLineNumber: start, endLineNumberExclusive: end + 1 };
+
+            return {
+                original: toLineRange(change.originalStartLineNumber, change.originalEndLineNumber),
+                modified: toLineRange(change.modifiedStartLineNumber, change.modifiedEndLineNumber),
+                kind
+            };
+        });
+
+        const model = editor.getModel();
+        this.proxy.$acceptEditorDiffInformation(id, [{
+            documentVersion: model.getVersionId(),
+            original: originalUri,
+            modified: modifiedUri,
+            changes,
+            isStale: false
+        }]);
+    }
+
+    private findEditorIdsByUri(uri: string, excludeDiffEditors = false): string[] {
+        const ids: string[] = [];
+        for (const id of this.editorsToDispose.keys()) {
+            const editor = this.editorsAndDocuments.getEditor(id);
+            if (editor && editor.getModel().uri.toString() === uri) {
+                if (excludeDiffEditors && editor.getDiffEditor()) {
+                    continue;
+                }
+                ids.push(id);
+            }
+        }
+        return ids;
     }
 
     private onTextEditorRemove(id: string): void {

package/src/plugin/command-registry.ts

@@ -22,10 +22,11 @@ import * as theia from '@theia/plugin';
 import * as model from '../common/plugin-api-rpc-model';
 import { CommandRegistryExt, PLUGIN_RPC_CONTEXT as Ext, CommandRegistryMain } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { Disposable } from './types-impl';
+import { Disposable, URI } from './types-impl';
 import { DisposableCollection } from '@theia/core';
 import { KnownCommands } from './known-commands';
 import { ArgumentProcessor } from '../common/commands';
+import { isUriComponents } from './type-converters';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Handler = <T>(...args: any[]) => T | PromiseLike<T | undefined>;
@@ -42,6 +43,16 @@ export class CommandRegistryImpl implements CommandRegistryExt {
         this.proxy = rpc.getProxy(Ext.COMMAND_REGISTRY_MAIN);
         this.argumentProcessors = [];
         this.commandsConverter = new CommandsConverter(this);
+        this.registerArgumentProcessor({
+            processArgument: arg => {
+                // Revive URI-like plain objects that lost their class identity during RPC/JSON serialization
+                // (e.g. command arguments from markdown links parsed by CommandOpenHandler)
+                if (isUriComponents(arg) && !(arg instanceof URI)) {
+                    return URI.revive(arg);
+                }
+                return arg;
+            }
+        });
     }
 
     get converter(): CommandsConverter {

package/src/plugin/env.ts

@@ -108,6 +108,14 @@ export abstract class EnvExtImpl {
 
     abstract get isNewAppInstall(): boolean;
 
+    /**
+     * @stubbed
+     * Portable mode detection is not yet communicated to the plugin host.
+     */
+    get isAppPortable(): boolean {
+        return false;
+    }
+
     get appHost(): string {
         return this.host;
     }

package/src/plugin/plugin-context.ts

@@ -930,6 +930,7 @@ export function createAPIFactory(
             get appHost(): string { return envExt.appHost; },
             get language(): string { return envExt.language; },
             get isNewAppInstall(): boolean { return envExt.isNewAppInstall; },
+            get isAppPortable(): boolean { return envExt.isAppPortable; },
             get isTelemetryEnabled(): boolean { return telemetryExt.isTelemetryEnabled; },
             get onDidChangeTelemetryEnabled(): theia.Event<boolean> {
                 return telemetryExt.onDidChangeTelemetryEnabled;
@@ -1285,8 +1286,8 @@ export function createAPIFactory(
                     throw new Error('Input box not found!');
                 }
             },
-            createSourceControl(id: string, label: string, rootUri?: URI): theia.SourceControl {
-                return createAPIObject(scmExt.createSourceControl(plugin, id, label, rootUri));
+            createSourceControl(id: string, label: string, rootUri?: URI, iconPath?: theia.IconPath, parent?: theia.SourceControl): theia.SourceControl {
+                return createAPIObject(scmExt.createSourceControl(plugin, id, label, rootUri, iconPath, parent));
             }
         };
 

package/src/plugin/scm.ts

@@ -676,12 +676,23 @@ class SourceControlImpl implements theia.SourceControl {
     private readonly onDidChangeSelectionEmitter = new Emitter<boolean>();
     readonly onDidChangeSelection = this.onDidChangeSelectionEmitter.event;
 
+    private _contextValue: string | undefined = undefined;
+
+    get contextValue(): string | undefined {
+        return this._contextValue;
+    }
+
+    set contextValue(contextValue: string | undefined) {
+        this._contextValue = contextValue;
+        this.proxy.$updateSourceControl(this.handle, { contextValue });
+    }
+
     private readonly onDidDisposeEmitter = new Emitter<void>();
     readonly onDidDispose = this.onDidDisposeEmitter.event;
 
     readonly onDidDisposeParent: Event<void>;
 
-    private handle: number = SourceControlImpl.handlePool++;
+    readonly handle: number = SourceControlImpl.handlePool++;
 
     constructor(
         private plugin: Plugin,
@@ -694,7 +705,7 @@ class SourceControlImpl implements theia.SourceControl {
         _parent?: SourceControlImpl
     ) {
         this.inputBox = new ScmInputBoxImpl(plugin, this.proxy, this.handle);
-        this.proxy.$registerSourceControl(this.handle, _id, _label, _rootUri);
+        this.proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, _parent?.handle);
         this.onDidDisposeParent = _parent ? _parent.onDidDispose : Event.None;
     }
 
@@ -824,9 +835,11 @@ export class ScmExtImpl implements ScmExt {
         });
     }
 
-    createSourceControl(extension: Plugin, id: string, label: string, rootUri: theia.Uri | undefined): theia.SourceControl {
+    createSourceControl(extension: Plugin, id: string, label: string, rootUri: theia.Uri | undefined,
+        iconPath?: theia.IconPath, parent?: theia.SourceControl): theia.SourceControl {
         const handle = ScmExtImpl.handlePool++;
-        const sourceControl = new SourceControlImpl(extension, this.proxy, this.commands, id, label, rootUri);
+        const parentImpl = parent ? this.findSourceControlImpl(parent) : undefined;
+        const sourceControl = new SourceControlImpl(extension, this.proxy, this.commands, id, label, rootUri, iconPath, parentImpl);
         this.sourceControls.set(handle, sourceControl);
 
         const sourceControls = this.sourceControlsByExtension.get(extension.model.id) || [];
@@ -836,6 +849,15 @@ export class ScmExtImpl implements ScmExt {
         return sourceControl;
     }
 
+    private findSourceControlImpl(apiObject: theia.SourceControl): SourceControlImpl | undefined {
+        for (const impl of this.sourceControls.values()) {
+            if (impl.id === apiObject.id && impl.rootUri?.toString() === apiObject.rootUri?.toString()) {
+                return impl;
+            }
+        }
+        return undefined;
+    }
+
     getLastInputBox(extension: Plugin): ScmInputBoxImpl | undefined {
         const sourceControls = this.sourceControlsByExtension.get(extension.model.id);
         const sourceControl = sourceControls && sourceControls[sourceControls.length - 1];

package/src/plugin/text-editors.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { TextEditorsExt, EditorChangedPropertiesData, TextEditorPositionData, TextEditorsMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
+import { TextEditorsExt, EditorChangedPropertiesData, TextEditorPositionData, TextEditorsMain, PLUGIN_RPC_CONTEXT, TextEditorDiffInformationDto } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import * as theia from '@theia/plugin';
 import { Emitter, Event } from '@theia/core/lib/common/event';
@@ -120,7 +120,7 @@ export class TextEditorsExtImpl implements TextEditorsExt {
         return activeEditor.getDiffInformation();
     }
 
-    $acceptEditorDiffInformation(id: string, diffInformation: theia.TextEditorDiffInformation[] | undefined): void {
+    $acceptEditorDiffInformation(id: string, diffInformation: TextEditorDiffInformationDto[] | undefined): void {
         const textEditor = this.editorsAndDocuments.getEditor(id);
         if (!textEditor) {
             throw new Error('unknown text editor');