@theia/plugin-ext 1.59.0 → 1.60.0-next.47

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

@@ -38,9 +38,10 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { UndoRedoService } from '@theia/editor/lib/browser/undo-redo-service';
 import { WebviewsMainImpl } from '../webviews-main';
 import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
-import { ApplicationShell, LabelProvider, Saveable, SaveOptions } from '@theia/core/lib/browser';
+import { ApplicationShell, LabelProvider, Saveable, SaveAsOptions, SaveOptions } from '@theia/core/lib/browser';
 import { WebviewPanelOptions } from '@theia/plugin';
 import { EditorPreferences } from '@theia/editor/lib/browser';
+import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 
 const enum CustomEditorModelType {
     Custom,
@@ -186,7 +187,7 @@ export class CustomEditorsMainImpl implements CustomEditorsMain, Disposable {
 
         switch (modelType) {
             case CustomEditorModelType.Text: {
-                const model = CustomTextEditorModel.create(viewType, resource, this.textModelService, this.fileService);
+                const model = CustomTextEditorModel.create(viewType, resource, this.textModelService);
                 return this.customEditorService.models.add(resource, viewType, model);
             }
             case CustomEditorModelType.Custom: {
@@ -224,7 +225,7 @@ export interface CustomEditorModel extends Saveable, Disposable {
 
     revert(options?: Saveable.RevertOptions): Promise<void>;
     saveCustomEditor(options?: SaveOptions): Promise<void>;
-    saveCustomEditorAs(resource: TheiaURI, targetResource: TheiaURI, options?: SaveOptions): Promise<void>;
+    saveCustomEditorAs?(resource: TheiaURI, targetResource: TheiaURI, options?: SaveOptions): Promise<void>;
 
     undo(): void;
     redo(): void;
@@ -329,7 +330,7 @@ export class MainCustomEditorModel implements CustomEditorModel {
         }
 
         const cancellationSource = new CancellationTokenSource();
-        this.proxy.$revert(this.resource, this.viewType, cancellationSource.token);
+        await this.proxy.$revert(this.resource, this.viewType, cancellationSource.token);
         this.change(() => {
             this.isDirtyFromContentChange = false;
             this.currentEditIndex = this.savePoint;
@@ -347,7 +348,7 @@ export class MainCustomEditorModel implements CustomEditorModel {
         }
 
         const cancelable = new CancellationTokenSource();
-        const savePromise = this.proxy.$onSave(this.resource, this.viewType, cancelable.token);
+        const savePromise = this.proxy.$save(this.resource, this.viewType, cancelable.token);
         this.ongoingSave?.cancel();
         this.ongoingSave = cancelable;
 
@@ -367,10 +368,14 @@ export class MainCustomEditorModel implements CustomEditorModel {
         }
     }
 
+    async saveAs(options: SaveAsOptions): Promise<void> {
+        await this.saveCustomEditorAs(new TheiaURI(this.resource), options.target, options);
+    }
+
     async saveCustomEditorAs(resource: TheiaURI, targetResource: TheiaURI, options?: SaveOptions): Promise<void> {
         if (this.editable) {
             const source = new CancellationTokenSource();
-            await this.proxy.$onSaveAs(this.resource, this.viewType, targetResource.toComponents(), source.token);
+            await this.proxy.$saveAs(this.resource, this.viewType, targetResource.toComponents(), source.token);
             this.change(() => {
                 this.savePoint = this.currentEditIndex;
             });
@@ -450,19 +455,17 @@ export class CustomTextEditorModel implements CustomEditorModel {
     static async create(
         viewType: string,
         resource: TheiaURI,
-        editorModelService: EditorModelService,
-        fileService: FileService,
+        editorModelService: EditorModelService
     ): Promise<CustomTextEditorModel> {
         const model = await editorModelService.createModelReference(resource);
         model.object.suppressOpenEditorWhenDirty = true;
-        return new CustomTextEditorModel(viewType, resource, model, fileService);
+        return new CustomTextEditorModel(viewType, resource, model);
     }
 
     constructor(
         readonly viewType: string,
         readonly editorResource: TheiaURI,
-        private readonly model: Reference<MonacoEditorModel>,
-        private readonly fileService: FileService,
+        private readonly model: Reference<MonacoEditorModel>
     ) {
         this.toDispose.push(
             this.editorTextModel.onDirtyChanged(e => {
@@ -507,13 +510,12 @@ export class CustomTextEditorModel implements CustomEditorModel {
         return this.saveCustomEditor(options);
     }
 
-    saveCustomEditor(options?: SaveOptions): Promise<void> {
-        return this.editorTextModel.save(options);
+    serialize(): Promise<BinaryBuffer> {
+        return this.editorTextModel.serialize();
     }
 
-    async saveCustomEditorAs(resource: TheiaURI, targetResource: TheiaURI, options?: SaveOptions): Promise<void> {
-        await this.saveCustomEditor(options);
-        await this.fileService.copy(resource, targetResource, { overwrite: false });
+    saveCustomEditor(options?: SaveOptions): Promise<void> {
+        return this.editorTextModel.save(options);
     }
 
     undo(): void {

package/src/main/browser/debug/plugin-debug-configuration-provider.ts

@@ -23,6 +23,11 @@ import {
 import { DebugConfiguration } from '@theia/debug/lib/common/debug-configuration';
 
 export class PluginDebugConfigurationProvider implements DebugConfigurationProvider {
+    /**
+     * After https://github.com/eclipse-theia/theia/pull/13196, the debug config handles might change.
+     * Store the original handle to be able to call the extension host when getting by handle.
+     */
+    protected readonly originalHandle: number;
     public handle: number;
     public type: string;
     public triggerKind: DebugConfigurationProviderTriggerKind;
@@ -41,23 +46,24 @@ export class PluginDebugConfigurationProvider implements DebugConfigurationProvi
         protected readonly debugExt: DebugExt
     ) {
         this.handle = description.handle;
+        this.originalHandle = this.handle;
         this.type = description.type;
         this.triggerKind = description.trigger;
 
         if (description.provideDebugConfiguration) {
-            this.provideDebugConfigurations = async (folder: string | undefined) => this.debugExt.$provideDebugConfigurationsByHandle(this.handle, folder);
+            this.provideDebugConfigurations = async (folder: string | undefined) => this.debugExt.$provideDebugConfigurationsByHandle(this.originalHandle, folder);
         }
 
         if (description.resolveDebugConfigurations) {
             this.resolveDebugConfiguration =
                 async (folder: string | undefined, debugConfiguration: DebugConfiguration) =>
-                    this.debugExt.$resolveDebugConfigurationByHandle(this.handle, folder, debugConfiguration);
+                    this.debugExt.$resolveDebugConfigurationByHandle(this.originalHandle, folder, debugConfiguration);
         }
 
         if (description.resolveDebugConfigurationWithSubstitutedVariables) {
             this.resolveDebugConfigurationWithSubstitutedVariables =
                 async (folder: string | undefined, debugConfiguration: DebugConfiguration) =>
-                    this.debugExt.$resolveDebugConfigurationWithSubstitutedVariablesByHandle(this.handle, folder, debugConfiguration);
+                    this.debugExt.$resolveDebugConfigurationWithSubstitutedVariablesByHandle(this.originalHandle, folder, debugConfiguration);
         }
     }
 }

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

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 import { injectable } from '@theia/core/shared/inversify';
-import { Message } from '@theia/core/shared/@phosphor/messaging';
+import { Message } from '@theia/core/shared/@lumino/messaging';
 import { codiconArray, Key } from '@theia/core/lib/browser';
 import { AbstractDialog } from '@theia/core/lib/browser/dialogs';
 import '../../../../src/main/browser/dialogs/style/modal-notification.css';

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

@@ -16,7 +16,7 @@
 
 import * as React from '@theia/core/shared/react';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { Message } from '@theia/core/shared/@phosphor/messaging';
+import { Message } from '@theia/core/shared/@lumino/messaging';
 import { 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';

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

@@ -53,6 +53,8 @@ export class PluginScmResourceGroup implements ScmResourceGroup {
 
     get hideWhenEmpty(): boolean { return !!this.features.hideWhenEmpty; }
 
+    get contextValue(): string | undefined { return this.features.contextValue; }
+
     private readonly onDidChangeEmitter = new Emitter<void>();
     readonly onDidChange: Event<void> = this.onDidChangeEmitter.event;
 

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

@@ -62,16 +62,16 @@
   display: inline-block;
 }
 
-.p-TabBar.theia-app-sides .theia-plugin-file-icon,
-.p-TabBar.theia-app-sides .theia-plugin-file-icon::before,
-.p-TabBar.theia-app-sides .theia-plugin-folder-icon,
-.p-TabBar.theia-app-sides .theia-plugin-folder-icon::before,
-.p-TabBar.theia-app-sides .theia-plugin-folder-expanded-icon,
-.p-TabBar.theia-app-sides .theia-plugin-folder-expanded-icon::before,
-.p-TabBar.theia-app-sides .theia-plugin-root-folder-icon,
-.p-TabBar.theia-app-sides .theia-plugin-root-folder-icon::before,
-.p-TabBar.theia-app-sides .theia-plugin-root-folder-expanded-icon,
-.p-TabBar.theia-app-sides .theia-plugin-root-folder-expanded-icon::before {
+.lm-TabBar.theia-app-sides .theia-plugin-file-icon,
+.lm-TabBar.theia-app-sides .theia-plugin-file-icon::before,
+.lm-TabBar.theia-app-sides .theia-plugin-folder-icon,
+.lm-TabBar.theia-app-sides .theia-plugin-folder-icon::before,
+.lm-TabBar.theia-app-sides .theia-plugin-folder-expanded-icon,
+.lm-TabBar.theia-app-sides .theia-plugin-folder-expanded-icon::before,
+.lm-TabBar.theia-app-sides .theia-plugin-root-folder-icon,
+.lm-TabBar.theia-app-sides .theia-plugin-root-folder-icon::before,
+.lm-TabBar.theia-app-sides .theia-plugin-root-folder-expanded-icon,
+.lm-TabBar.theia-app-sides .theia-plugin-root-folder-expanded-icon::before {
   padding: 0px !important;
   width: var(--theia-private-sidebar-icon-size) !important;
   height: var(--theia-private-sidebar-icon-size) !important;

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

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  ********************************************************************************/
 
-.theia-webview.p-mod-hidden {
+.theia-webview.lm-mod-hidden {
   visibility: hidden;
   display: flex !important;
 }
@@ -48,7 +48,7 @@
   content: "";
 }
 
-.p-TabBar.theia-app-sides .theia-webview-icon::before {
+.lm-TabBar.theia-app-sides .theia-webview-icon::before {
   width: var(--theia-private-sidebar-icon-size);
   height: var(--theia-private-sidebar-icon-size);
   background-size: contain;

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

@@ -68,7 +68,7 @@ export class TabsMainImpl implements TabsMain, Disposable {
         this.createTabsModel();
 
         const tabBars = this.applicationShell.mainPanel.tabBars();
-        for (let tabBar: TabBar<Widget> | undefined; tabBar = tabBars.next();) {
+        for (const tabBar of tabBars) {
             this.attachListenersToTabBar(tabBar);
         }
 

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

@@ -235,9 +235,11 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
             });
         };
 
-        hookDockPanelKey(this.shell.leftPanelHandler.dockPanel, this.viewContextKeys.activeViewlet);
-        hookDockPanelKey(this.shell.rightPanelHandler.dockPanel, this.viewContextKeys.activeAuxiliary);
-        hookDockPanelKey(this.shell.bottomPanel, this.viewContextKeys.activePanel);
+        this.shell.initialized.then(() => {
+            hookDockPanelKey(this.shell.leftPanelHandler.dockPanel, this.viewContextKeys.activeViewlet);
+            hookDockPanelKey(this.shell.rightPanelHandler.dockPanel, this.viewContextKeys.activeAuxiliary);
+            hookDockPanelKey(this.shell.bottomPanel, this.viewContextKeys.activePanel);
+        });
     }
 
     protected async updateViewWelcomeVisibility(viewId: string): Promise<void> {

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

@@ -15,11 +15,11 @@
 // *****************************************************************************
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { Panel, Widget } from '@theia/core/shared/@phosphor/widgets';
+import { Panel, Widget } from '@theia/core/shared/@lumino/widgets';
 import { MenuModelRegistry } from '@theia/core/lib/common/menu';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { StatefulWidget } from '@theia/core/lib/browser/shell/shell-layout-restorer';
-import { Message } from '@theia/core/shared/@phosphor/messaging';
+import { Message } from '@theia/core/shared/@lumino/messaging';
 import { TreeViewWidget } from './tree-view-widget';
 import { BadgeWidget, DescriptionWidget, DynamicToolbarWidget } from '@theia/core/lib/browser/view-container';
 import { DisposableCollection, Emitter, Event } from '@theia/core/lib/common';

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

@@ -21,7 +21,7 @@
 // copied and modified from https://github.com/microsoft/vscode/blob/ba40bd16433d5a817bfae15f3b4350e18f144af4/src/vs/workbench/contrib/webview/browser/webviewElement.ts#
 
 import * as mime from 'mime';
-import { JSONExt } from '@theia/core/shared/@phosphor/coreutils';
+import { JSONExt } from '@theia/core/shared/@lumino/coreutils';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import { WebviewPanelOptions, WebviewPortMapping } from '@theia/plugin';
 import { BaseWidget, Message } from '@theia/core/lib/browser/widgets/widget';

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

@@ -25,7 +25,7 @@ import { WebviewWidget, WebviewWidgetIdentifier } from './webview/webview';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { ViewColumnService } from '@theia/core/lib/browser/shell/view-column-service';
 import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
-import { JSONExt } from '@theia/core/shared/@phosphor/coreutils';
+import { JSONExt } from '@theia/core/shared/@lumino/coreutils';
 import { Mutable } from '@theia/core/lib/common/types';
 import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
 import { IconUrl } from '../../common/plugin-protocol';

package/src/plugin/custom-editors.ts

@@ -184,12 +184,12 @@ export class CustomEditorsExtImpl implements CustomEditorsExt {
 
     async $undo(resourceComponents: UriComponents, viewType: string, editId: number, isDirty: boolean): Promise<void> {
         const entry = this.getCustomDocumentEntry(viewType, resourceComponents);
-        return entry.undo(editId, isDirty);
+        await entry.undo(editId, isDirty);
     }
 
     async $redo(resourceComponents: UriComponents, viewType: string, editId: number, isDirty: boolean): Promise<void> {
         const entry = this.getCustomDocumentEntry(viewType, resourceComponents);
-        return entry.redo(editId, isDirty);
+        await entry.redo(editId, isDirty);
     }
 
     async $revert(resourceComponents: UriComponents, viewType: string, cancellation: CancellationToken): Promise<void> {
@@ -198,16 +198,16 @@ export class CustomEditorsExtImpl implements CustomEditorsExt {
         await provider.revertCustomDocument(entry.document, cancellation);
     }
 
-    async $onSave(resourceComponents: UriComponents, viewType: string, cancellation: CancellationToken): Promise<void> {
+    async $save(resourceComponents: UriComponents, viewType: string, cancellation: CancellationToken): Promise<void> {
         const entry = this.getCustomDocumentEntry(viewType, resourceComponents);
         const provider = this.getCustomEditorProvider(viewType);
         await provider.saveCustomDocument(entry.document, cancellation);
     }
 
-    async $onSaveAs(resourceComponents: UriComponents, viewType: string, targetResource: UriComponents, cancellation: CancellationToken): Promise<void> {
+    async $saveAs(resourceComponents: UriComponents, viewType: string, targetResource: UriComponents, cancellation: CancellationToken): Promise<void> {
         const entry = this.getCustomDocumentEntry(viewType, resourceComponents);
         const provider = this.getCustomEditorProvider(viewType);
-        return provider.saveCustomDocumentAs(entry.document, URI.revive(targetResource), cancellation);
+        await provider.saveCustomDocumentAs(entry.document, URI.revive(targetResource), cancellation);
     }
 
     private getCustomEditorProvider(viewType: string): theia.CustomEditorProvider {

package/src/plugin/scm.ts

@@ -405,9 +405,17 @@ class ScmResourceGroupImpl implements theia.SourceControlResourceGroup {
         this.proxy.$updateGroup(this.sourceControlHandle, this.handle, this.features);
     }
 
+    private _contextValue: string | undefined = undefined;
+    get contextValue(): string | undefined { return this._contextValue; }
+    set contextValue(contextValue: string | undefined) {
+        this._contextValue = contextValue;
+        this.proxy.$updateGroup(this.sourceControlHandle, this.handle, this.features);
+    }
+
     get features(): SourceControlGroupFeatures {
         return {
-            hideWhenEmpty: this.hideWhenEmpty
+            hideWhenEmpty: this.hideWhenEmpty,
+            contextValue: this.contextValue
         };
     }
 
@@ -477,7 +485,7 @@ class ScmResourceGroupImpl implements theia.SourceControlResourceGroup {
                 // TODO remove the letter and colorId fields when the FileDecorationProvider is applied, see https://github.com/eclipse-theia/theia/pull/8911
                 const rawResource = {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    handle, sourceUri, letter: (r as any).letter, colorId: (r as any).color.id, icons,
+                    handle, sourceUri, letter: (r as any).letter, colorId: (r as any).color?.id, icons,
                     tooltip, strikeThrough, faded, contextValue, command
                 } as ScmRawResource;
 

package/src/plugin/status-bar/status-bar-item.ts

@@ -16,7 +16,7 @@
 import * as theia from '@theia/plugin';
 import { ThemeColor, StatusBarAlignment } from '../types-impl';
 import { StatusBarMessageRegistryMain } from '../../common/plugin-api-rpc';
-import { UUID } from '@theia/core/shared/@phosphor/coreutils';
+import { UUID } from '@theia/core/shared/@lumino/coreutils';
 
 export class StatusBarItemImpl implements theia.StatusBarItem {
 

package/src/plugin/tasks/tasks.ts

@@ -28,7 +28,7 @@ import { RPCProtocol } from '../../common/rpc-protocol';
 import { TaskProviderAdapter } from './task-provider';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { TerminalServiceExtImpl } from '../terminal-ext';
-import { UUID } from '@theia/core/shared/@phosphor/coreutils';
+import { UUID } from '@theia/core/shared/@lumino/coreutils';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
 
 type ExecutionCallback = (resolvedDefinition: theia.TaskDefinition) => Thenable<theia.Pseudoterminal>;

package/src/plugin/terminal-ext.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { UUID } from '@theia/core/shared/@phosphor/coreutils';
+import { UUID } from '@theia/core/shared/@lumino/coreutils';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { TerminalServiceExt, TerminalServiceMain, PLUGIN_RPC_CONTEXT, Plugin, TerminalOptions } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';

package/src/plugin/types-impl.ts

@@ -21,7 +21,7 @@
 
 /* eslint-disable no-null/no-null */
 
-import { UUID } from '@theia/core/shared/@phosphor/coreutils';
+import { UUID } from '@theia/core/shared/@lumino/coreutils';
 import { illegalArgument } from '../common/errors';
 import type * as theia from '@theia/plugin';
 import { URI as CodeURI, UriComponents } from '@theia/core/shared/vscode-uri';