@theia/plugin-ext 1.38.0 → 1.39.0-next.12

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

@@ -964,7 +964,7 @@ export interface SourceControlGroupFeatures {
 export interface ScmRawResource {
     handle: number,
     sourceUri: UriComponents,
-    icons: UriComponents[],
+    icons: (IconUrl | ThemeIcon | undefined)[], /* icons: light, dark */
     tooltip: string,
     strikeThrough: boolean,
     faded: boolean,

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

@@ -185,7 +185,7 @@ export class CustomEditorsMainImpl implements CustomEditorsMain, Disposable {
 
         switch (modelType) {
             case CustomEditorModelType.Text: {
-                const model = CustomTextEditorModel.create(viewType, resource, this.textModelService, this.fileService, this.editorPreferences);
+                const model = CustomTextEditorModel.create(viewType, resource, this.textModelService, this.fileService);
                 return this.customEditorService.models.add(resource, viewType, model);
             }
             case CustomEditorModelType.Custom: {
@@ -521,19 +521,16 @@ export class CustomTextEditorModel implements CustomEditorModel {
     private readonly toDispose = new DisposableCollection();
     private readonly onDirtyChangedEmitter = new Emitter<void>();
     readonly onDirtyChanged = this.onDirtyChangedEmitter.event;
-    autoSave: 'off' | 'afterDelay' | 'onFocusChange' | 'onWindowChange';
-    autoSaveDelay: number;
 
     static async create(
         viewType: string,
         resource: TheiaURI,
         editorModelService: EditorModelService,
         fileService: FileService,
-        editorPreferences: EditorPreferences,
     ): Promise<CustomTextEditorModel> {
         const model = await editorModelService.createModelReference(resource);
         model.object.suppressOpenEditorWhenDirty = true;
-        return new CustomTextEditorModel(viewType, resource, model, fileService, editorPreferences);
+        return new CustomTextEditorModel(viewType, resource, model, fileService);
     }
 
     constructor(
@@ -541,7 +538,6 @@ export class CustomTextEditorModel implements CustomEditorModel {
         readonly editorResource: TheiaURI,
         private readonly model: Reference<MonacoEditorModel>,
         private readonly fileService: FileService,
-        private readonly editorPreferences: EditorPreferences
     ) {
         this.toDispose.push(
             this.editorTextModel.onDirtyChanged(e => {
@@ -549,21 +545,14 @@ export class CustomTextEditorModel implements CustomEditorModel {
             })
         );
         this.toDispose.push(this.onDirtyChangedEmitter);
+    }
 
-        this.autoSave = this.editorPreferences.get('files.autoSave', undefined, editorResource.toString());
-        this.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, editorResource.toString());
+    get autoSave(): 'off' | 'afterDelay' | 'onFocusChange' | 'onWindowChange' {
+        return this.editorTextModel.autoSave;
+    }
 
-        this.toDispose.push(
-            this.editorPreferences.onPreferenceChanged(event => {
-                if (event.preferenceName === 'files.autoSave') {
-                    this.autoSave = this.editorPreferences.get('files.autoSave', undefined, editorResource.toString());
-                }
-                if (event.preferenceName === 'files.autoSaveDelay') {
-                    this.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, editorResource.toString());
-                }
-            })
-        );
-        this.toDispose.push(this.onDirtyChangedEmitter);
+    get autoSaveDelay(): number {
+        return this.editorTextModel.autoSaveDelay;
     }
 
     dispose(): void {

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

@@ -40,6 +40,9 @@ import { URI as vscodeURI } from '@theia/core/shared/vscode-uri';
 import { Splice } from '../../common/arrays';
 import { UriComponents } from '../../common/uri-components';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { PluginSharedStyle } from './plugin-shared-style';
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { IconUrl } from '../../common';
 
 export class PluginScmResourceGroup implements ScmResourceGroup {
 
@@ -147,10 +150,12 @@ export class PluginScmProvider implements ScmProvider {
     constructor(
         private readonly proxy: ScmExt,
         private readonly colors: ColorRegistry,
+        private readonly sharedStyle: PluginSharedStyle,
         private readonly _handle: number,
         private readonly _contextValue: string,
         private readonly _label: string,
-        private readonly _rootUri: vscodeURI | undefined
+        private readonly _rootUri: vscodeURI | undefined,
+        private disposables: DisposableCollection
     ) { }
 
     updateSourceControl(features: SourceControlProviderFeatures): void {
@@ -222,13 +227,13 @@ export class PluginScmProvider implements ScmProvider {
                 const { start, deleteCount, rawResources } = groupSlice;
                 const resources = rawResources.map(rawResource => {
                     const { handle, sourceUri, icons, tooltip, strikeThrough, faded, contextValue, command } = rawResource;
-                    const icon = icons[0];
-                    const iconDark = icons[1] || icon;
+                    const icon = this.toIconClass(icons[0]);
+                    const iconDark = this.toIconClass(icons[1]) || icon;
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     const colorVariable = (rawResource as any).colorId && this.colors.toCssVariableName((rawResource as any).colorId);
                     const decorations = {
-                        icon: icon ? vscodeURI.revive(icon) : undefined,
-                        iconDark: iconDark ? vscodeURI.revive(iconDark) : undefined,
+                        icon,
+                        iconDark,
                         tooltip,
                         strikeThrough,
                         // TODO remove the letter and colorId fields when the FileDecorationProvider is applied, see https://github.com/eclipse-theia/theia/pull/8911
@@ -258,6 +263,18 @@ export class PluginScmProvider implements ScmProvider {
         this.onDidChangeResourcesEmitter.fire();
     }
 
+    private toIconClass(icon: IconUrl | ThemeIcon | undefined): string | undefined {
+        if (!icon) {
+            return undefined;
+        }
+        if (ThemeIcon.isThemeIcon(icon)) {
+            return ThemeIcon.asClassName(icon);
+        }
+        const reference = this.sharedStyle.toIconClass(icon);
+        this.disposables.push(reference);
+        return reference.object.iconClass;
+    }
+
     unregisterGroup(handle: number): void {
         const group = this.groupsByHandle[handle];
 
@@ -280,11 +297,13 @@ export class ScmMainImpl implements ScmMain {
     private repositoryDisposables = new Map<number, DisposableCollection>();
     private readonly disposables = new DisposableCollection();
     private readonly colors: ColorRegistry;
+    private readonly sharedStyle: PluginSharedStyle;
 
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.SCM_EXT);
         this.scmService = container.get(ScmService);
         this.colors = container.get(ColorRegistry);
+        this.sharedStyle = container.get(PluginSharedStyle);
     }
 
     dispose(): void {
@@ -298,7 +317,7 @@ export class ScmMainImpl implements ScmMain {
     }
 
     async $registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined): Promise<void> {
-        const provider = new PluginScmProvider(this.proxy, this.colors, handle, id, label, rootUri ? vscodeURI.revive(rootUri) : undefined);
+        const provider = new PluginScmProvider(this.proxy, this.colors, this.sharedStyle, handle, id, label, rootUri ? vscodeURI.revive(rootUri) : undefined, this.disposables);
         const repository = this.scmService.registerScmProvider(provider, {
             input: {
                 validator: async value => {

package/src/main/browser/webview/webview-context-keys.ts

@@ -34,7 +34,7 @@ export class WebviewContextKeys {
     protected contextKeyService: ContextKeyService;
 
     @postConstruct()
-    protected postConstruct(): void {
+    protected init(): void {
         this.activeWebviewPanelId = this.contextKeyService.createKey('activeWebviewPanelId', '');
         this.applicationShell.onDidChangeCurrentWidget(this.handleDidChangeCurrentWidget, this);
     }

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

@@ -33,7 +33,11 @@ export class WebviewEnvironment {
     protected readonly environments: EnvVariablesServer;
 
     @postConstruct()
-    protected async init(): Promise<void> {
+    protected init(): void {
+        this.doInit();
+    }
+
+    protected async doInit(): Promise<void> {
         this._hostPatternPromise = this.getHostPattern();
         try {
             const endpointPattern = await this.hostPatternPromise;

package/src/main/node/plugin-service.ts

@@ -34,7 +34,7 @@ export class PluginApiContribution implements BackendApplicationContribution, Ws
     protected serveSameOrigin: boolean = false;
 
     @postConstruct()
-    protected postConstruct(): void {
+    protected init(): void {
         const webviewExternalEndpoint = this.webviewExternalEndpoint();
         console.log(`Configuring to accept webviews on '${webviewExternalEndpoint}' hostname.`);
         this.webviewExternalEndpointRegExp = new RegExp(webviewExternalEndpoint, 'i');

package/src/plugin/scm.ts

@@ -35,20 +35,26 @@ import { Splice } from '../common/arrays';
 import { UriComponents } from '../common/uri-components';
 import { Command } from '../common/plugin-api-rpc-model';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { URI } from './types-impl';
+import { URI, ThemeIcon } from './types-impl';
 import { ScmCommandArg } from '../common/plugin-api-rpc';
 import { sep } from '@theia/core/lib/common/paths';
+import { PluginIconPath } from './plugin-icon-path';
 type ProviderHandle = number;
 type GroupHandle = number;
 type ResourceStateHandle = number;
 
-function getIconResource(decorations?: theia.SourceControlResourceThemableDecorations): theia.Uri | undefined {
-    if (!decorations) {
+function getIconResource(decorations?: theia.SourceControlResourceThemableDecorations): UriComponents | ThemeIcon | undefined {
+    if (!decorations || !decorations.iconPath) {
         return undefined;
     } else if (typeof decorations.iconPath === 'string') {
         return URI.file(decorations.iconPath);
-    } else {
+    } else if (URI.isUri(decorations.iconPath)) {
+        return decorations.iconPath;
+    } else if (ThemeIcon.is(decorations.iconPath)) {
         return decorations.iconPath;
+    } else {
+        console.warn(`Unexpected Value ${decorations.iconPath} in Source Control Resource Themable Decoration. URI, ThemeIcon or string expected.`);
+        return undefined;
     }
 }
 
@@ -111,8 +117,8 @@ function compareResourceThemableDecorations(a: theia.SourceControlResourceThemab
         return 1;
     }
 
-    const aPath = typeof a.iconPath === 'string' ? a.iconPath : a.iconPath.fsPath;
-    const bPath = typeof b.iconPath === 'string' ? b.iconPath : b.iconPath.fsPath;
+    const aPath = typeof a.iconPath === 'string' ? a.iconPath : URI.isUri(a.iconPath) ? a.iconPath.fsPath : (a.iconPath as ThemeIcon).id;
+    const bPath = typeof b.iconPath === 'string' ? b.iconPath : URI.isUri(b.iconPath) ? b.iconPath.fsPath : (b.iconPath as ThemeIcon).id;
     return comparePaths(aPath, bPath);
 }
 
@@ -361,7 +367,7 @@ export class ScmInputBoxImpl implements theia.SourceControlInputBox {
     }
 }
 
-class SsmResourceGroupImpl implements theia.SourceControlResourceGroup {
+class ScmResourceGroupImpl implements theia.SourceControlResourceGroup {
 
     private static handlePool: number = 0;
     private resourceHandlePool: number = 0;
@@ -409,12 +415,13 @@ class SsmResourceGroupImpl implements theia.SourceControlResourceGroup {
         this.onDidUpdateResourceStatesEmitter.fire();
     }
 
-    readonly handle = SsmResourceGroupImpl.handlePool++;
+    readonly handle = ScmResourceGroupImpl.handlePool++;
 
     constructor(
         private proxy: ScmMain,
         private commands: CommandRegistryImpl,
         private sourceControlHandle: number,
+        private plugin: Plugin,
         private _id: string,
         private _label: string,
     ) { }
@@ -443,10 +450,11 @@ class SsmResourceGroupImpl implements theia.SourceControlResourceGroup {
                 this.resourceStatesMap.set(handle, r);
 
                 const sourceUri = r.resourceUri;
-                const iconUri = getIconResource(r.decorations);
-                const lightIconUri = r.decorations && getIconResource(r.decorations.light) || iconUri;
-                const darkIconUri = r.decorations && getIconResource(r.decorations.dark) || iconUri;
-                const icons: UriComponents[] = [];
+
+                const icon = getIconResource(r.decorations);
+                const lightIcon = r.decorations && getIconResource(r.decorations.light) || icon;
+                const darkIcon = r.decorations && getIconResource(r.decorations.dark) || icon;
+                const icons = [this.getThemableIcon(lightIcon), this.getThemableIcon(darkIcon)];
                 let command: Command | undefined;
 
                 if (r.command) {
@@ -459,14 +467,6 @@ class SsmResourceGroupImpl implements theia.SourceControlResourceGroup {
                     }
                 }
 
-                if (lightIconUri) {
-                    icons.push(lightIconUri);
-                }
-
-                if (darkIconUri && (darkIconUri.toString() !== lightIconUri?.toString())) {
-                    icons.push(darkIconUri);
-                }
-
                 const tooltip = (r.decorations && r.decorations.tooltip) || '';
                 const strikeThrough = r.decorations && !!r.decorations.strikeThrough;
                 const faded = r.decorations && !!r.decorations.faded;
@@ -511,6 +511,15 @@ class SsmResourceGroupImpl implements theia.SourceControlResourceGroup {
         return rawResourceSplices;
     }
 
+    private getThemableIcon(icon: UriComponents | ThemeIcon | undefined): string | ThemeIcon | undefined {
+        if (!icon) {
+            return undefined;
+        } else if (ThemeIcon.is(icon)) {
+            return icon;
+        }
+        return PluginIconPath.asString(URI.revive(icon), this.plugin);
+    }
+
     dispose(): void {
         this._disposed = true;
         this.onDidDisposeEmitter.fire();
@@ -520,7 +529,7 @@ class SsmResourceGroupImpl implements theia.SourceControlResourceGroup {
 class SourceControlImpl implements theia.SourceControl {
 
     private static handlePool: number = 0;
-    private groups: Map<GroupHandle, SsmResourceGroupImpl> = new Map<GroupHandle, SsmResourceGroupImpl>();
+    private groups: Map<GroupHandle, ScmResourceGroupImpl> = new Map<GroupHandle, ScmResourceGroupImpl>();
 
     get id(): string {
         return this._id;
@@ -626,7 +635,7 @@ class SourceControlImpl implements theia.SourceControl {
     private handle: number = SourceControlImpl.handlePool++;
 
     constructor(
-        plugin: Plugin,
+        private plugin: Plugin,
         private proxy: ScmMain,
         private commands: CommandRegistryImpl,
         private _id: string,
@@ -637,11 +646,11 @@ class SourceControlImpl implements theia.SourceControl {
         this.proxy.$registerSourceControl(this.handle, _id, _label, _rootUri);
     }
 
-    private createdResourceGroups = new Map<SsmResourceGroupImpl, Disposable>();
-    private updatedResourceGroups = new Set<SsmResourceGroupImpl>();
+    private createdResourceGroups = new Map<ScmResourceGroupImpl, Disposable>();
+    private updatedResourceGroups = new Set<ScmResourceGroupImpl>();
 
-    createResourceGroup(id: string, label: string): SsmResourceGroupImpl {
-        const group = new SsmResourceGroupImpl(this.proxy, this.commands, this.handle, id, label);
+    createResourceGroup(id: string, label: string): ScmResourceGroupImpl {
+        const group = new ScmResourceGroupImpl(this.proxy, this.commands, this.handle, this.plugin, id, label);
         const disposable = group.onDidDispose(() => this.createdResourceGroups.delete(group));
         this.createdResourceGroups.set(group, disposable);
         this.eventuallyAddResourceGroups();
@@ -703,7 +712,7 @@ class SourceControlImpl implements theia.SourceControl {
         this.updatedResourceGroups.clear();
     }
 
-    getResourceGroup(handle: GroupHandle): SsmResourceGroupImpl | undefined {
+    getResourceGroup(handle: GroupHandle): ScmResourceGroupImpl | undefined {
         return this.groups.get(handle);
     }