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

package/src/plugin/plugin-context.ts

@@ -158,7 +158,8 @@ import {
     TestRunProfileKind,
     TestTag,
     TestRunRequest,
-    TestMessage
+    TestMessage,
+    ExtensionKind
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -180,7 +181,6 @@ import { ConnectionImpl } from '../common/connection';
 import { TasksExtImpl } from './tasks/tasks';
 import { DebugExtImpl } from './debug/debug-ext';
 import { FileSystemExtImpl } from './file-system-ext-impl';
-import { QuickPick, QuickPickItem, ResourceLabelFormatter, LineChange } from '@theia/plugin';
 import { ScmExtImpl } from './scm';
 import { DecorationsExtImpl } from './decorations';
 import { TextEditorExt } from './text-editor';
@@ -308,7 +308,7 @@ export function createAPIFactory(
             getCommands(filterInternal: boolean = false): PromiseLike<string[]> {
                 return commandRegistry.getCommands(filterInternal);
             },
-            registerDiffInformationCommand(command: string, callback: (diff: LineChange[], ...args: any[]) => any, thisArg?: any): Disposable {
+            registerDiffInformationCommand(command: string, callback: (diff: theia.LineChange[], ...args: any[]) => any, thisArg?: any): Disposable {
                 // Dummy implementation.
                 return new Disposable(() => { });
             }
@@ -385,7 +385,7 @@ export function createAPIFactory(
             showQuickPick(items: any, options?: theia.QuickPickOptions, token?: theia.CancellationToken): any {
                 return quickOpenExt.showQuickPick(items, options, token);
             },
-            createQuickPick<T extends QuickPickItem>(): QuickPick<T> {
+            createQuickPick<T extends theia.QuickPickItem>(): theia.QuickPick<T> {
                 return quickOpenExt.createQuickPick(plugin);
             },
             showWorkspaceFolderPick(options?: theia.WorkspaceFolderPickOptions): PromiseLike<theia.WorkspaceFolder | undefined> {
@@ -461,7 +461,7 @@ export function createAPIFactory(
             },
             createTerminal(nameOrOptions: theia.TerminalOptions | theia.PseudoTerminalOptions | theia.ExtensionTerminalOptions | (string | undefined),
                 shellPath?: string,
-                shellArgs?: string[]): theia.Terminal {
+                shellArgs?: string[] | string): theia.Terminal {
                 return terminalExt.createTerminal(nameOrOptions, shellPath, shellArgs);
             },
             onDidChangeTerminalState,
@@ -476,6 +476,10 @@ export function createAPIFactory(
             createTreeView<T>(viewId: string, options: { treeDataProvider: theia.TreeDataProvider<T> }): theia.TreeView<T> {
                 return treeViewsExt.createTreeView(plugin, viewId, options);
             },
+            withScmProgress<R>(task: (progress: theia.Progress<number>) => Thenable<R>) {
+                const options: ProgressOptions = { location: ProgressLocation.SourceControl };
+                return notificationExt.withProgress(options, () => task({ report() { /* noop */ } }));
+            },
             withProgress<R>(
                 options: ProgressOptions,
                 task: (progress: Progress<{ message?: string; increment?: number }>, token: theia.CancellationToken) => PromiseLike<R>
@@ -610,7 +614,7 @@ export function createAPIFactory(
             registerTaskProvider(type: string, provider: theia.TaskProvider): theia.Disposable {
                 return tasks.registerTaskProvider(type, provider);
             },
-            registerResourceLabelFormatter(formatter: ResourceLabelFormatter): theia.Disposable {
+            registerResourceLabelFormatter(formatter: theia.ResourceLabelFormatter): theia.Disposable {
                 return labelServiceExt.$registerResourceLabelFormatter(formatter);
             },
             registerTimelineProvider(scheme: string | string[], provider: theia.TimelineProvider): theia.Disposable {
@@ -667,6 +671,24 @@ export function createAPIFactory(
             get onDidChangeLogLevel(): theia.Event<theia.LogLevel> { return onDidChangeLogLevel.event; }
         });
 
+        const extensions: typeof theia.extensions = Object.freeze({
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            getExtension<T = any>(extensionId: string): theia.Extension<T> | undefined {
+                const plg = pluginManager.getPluginById(extensionId.toLowerCase());
+                if (plg) {
+                    return new PluginExt(pluginManager, plg);
+                }
+                return undefined;
+            },
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            get all(): readonly theia.Extension<any>[] {
+                return pluginManager.getAllPlugins().map(plg => new PluginExt(pluginManager, plg));
+            },
+            get onDidChange(): theia.Event<void> {
+                return pluginManager.onDidChange;
+            }
+        });
+
         const languages: typeof theia.languages = {
             getLanguages(): PromiseLike<string[]> {
                 return languagesExt.getLanguages();
@@ -967,6 +989,7 @@ export function createAPIFactory(
             window,
             workspace,
             env,
+            extensions,
             languages,
             plugins,
             debug,
@@ -1100,16 +1123,12 @@ export function createAPIFactory(
             TestRunProfileKind,
             TestTag,
             TestRunRequest,
-            TestMessage
+            TestMessage,
+            ExtensionKind
         };
     };
 }
 
-export enum ExtensionKind {
-    UI = 1,
-    Workspace = 2
-}
-
 /**
  * Represents a Theia plugin as well as a VSCode extension.
  */
@@ -1131,7 +1150,7 @@ export interface ExtensionPlugin<T> extends theia.Plugin<T> {
      * is defined in the `package.json`-file of extensions. When no remote extension host exists,
      * the value is {@linkcode ExtensionKind.UI}.
      */
-    extensionKind: ExtensionKind;
+    extensionKind: theia.ExtensionKind;
 }
 
 export class Plugin<T> implements theia.Plugin<T> {

package/src/plugin/preference-registry.ts

@@ -17,13 +17,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { Emitter, Event } from '@theia/core/lib/common/event';
+import { isOSX, isWindows } from '@theia/core/lib/common/os';
 import { URI } from '@theia/core/shared/vscode-uri';
 import { ResourceMap } from '@theia/monaco-editor-core/esm/vs/base/common/map';
 import { IConfigurationOverrides, IOverrides } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
 import { Configuration, ConfigurationModel } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configurationModels';
 import { Workspace, WorkspaceFolder } from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace';
 import * as theia from '@theia/plugin';
-import { platform } from 'os';
 import { v4 } from 'uuid';
 import {
     PLUGIN_RPC_CONTEXT, PreferenceChangeExt, PreferenceData, PreferenceRegistryExt,
@@ -74,7 +74,7 @@ function lookUp(tree: any, key: string): any {
 export class TheiaWorkspace extends Workspace {
     constructor(ext: WorkspaceExtImpl) {
         const folders = (ext.workspaceFolders ?? []).map(folder => new WorkspaceFolder(folder));
-        super(v4(), folders, false, ext.workspaceFile ?? null, () => ['win32', 'darwin'].includes(platform()));
+        super(v4(), folders, false, ext.workspaceFile ?? null, () => isOSX || isWindows);
     }
 }
 
@@ -239,7 +239,15 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
         Object.keys(data[PreferenceScope.Folder]).forEach(resource => {
             folderConfigurations.set(URI.parse(resource), this.getConfigurationModel(data[PreferenceScope.Folder][resource]));
         });
-        return new Configuration(defaultConfiguration, userConfiguration, undefined, workspaceConfiguration, folderConfigurations);
+        return new Configuration(
+            defaultConfiguration,
+            new ConfigurationModel(), /** policy configuration. */
+            new ConfigurationModel(), /** application configuration. */
+            userConfiguration,
+            new ConfigurationModel(), /** remote configuration. */
+            workspaceConfiguration,
+            folderConfigurations
+        );
     }
 
     private getConfigurationModel(data: { [key: string]: any }): ConfigurationModel {

package/src/plugin/quick-open.ts

@@ -635,16 +635,18 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
             this._handlesToItems.set(i, item);
             this._itemsToHandles.set(item, i);
         });
-        this.update({
-            items: items.map((item, i) => {
-                if (item.kind === QuickPickItemKind.Separator) {
-                    return { kind: item.kind, label: item.label };
-                }
-                return {
+
+        const pickItems: TransferQuickPickItems[] = [];
+        for (let handle = 0; handle < items.length; handle++) {
+            const item = items[handle];
+            if (item.kind === QuickPickItemKind.Separator) {
+                pickItems.push({ type: 'separator', label: item.label, handle });
+            } else {
+                pickItems.push({
                     kind: item.kind,
                     label: item.label,
                     description: item.description,
-                    handle: i,
+                    handle,
                     detail: item.detail,
                     picked: item.picked,
                     alwaysShow: item.alwaysShow,
@@ -654,8 +656,12 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
                         tooltip: button.tooltip,
                         handle: button === QuickInputButtons.Back ? -1 : index,
                     }))
-                };
-            })
+                });
+            }
+        }
+
+        this.update({
+            items: pickItems,
         });
     }
 

package/src/plugin/terminal-ext.ts

@@ -61,7 +61,10 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         return [...this._terminals.values()];
     }
 
-    createTerminal(nameOrOptions: TerminalOptions | PseudoTerminalOptions | ExtensionTerminalOptions | (string | undefined), shellPath?: string, shellArgs?: string[]): Terminal {
+    createTerminal(
+        nameOrOptions: TerminalOptions | PseudoTerminalOptions | ExtensionTerminalOptions | (string | undefined),
+        shellPath?: string, shellArgs?: string[] | string
+    ): Terminal {
         let options: TerminalOptions;
         let pseudoTerminal: theia.Pseudoterminal | undefined = undefined;
         const id = `plugin-terminal-${UUID.uuid4()}`;

package/src/plugin/type-converters.ts

@@ -565,10 +565,22 @@ export function fromWorkspaceEdit(value: theia.WorkspaceEdit, documents?: any):
         if (Array.isArray(uriOrEdits)) {
             // text edits
             const doc = documents ? documents.getDocument(uri.toString()) : undefined;
-            result.edits.push(<WorkspaceTextEditDto>{ resource: uri, modelVersionId: doc && doc.version, edit: uriOrEdits.map(fromTextEdit)[0], metadata: entry[2] });
+            const workspaceTextEditDto: WorkspaceTextEditDto = {
+                resource: uri,
+                modelVersionId: doc?.version,
+                textEdit: uriOrEdits.map(fromTextEdit)[0],
+                metadata: entry[2] as types.WorkspaceEditMetadata
+            };
+            result.edits.push(workspaceTextEditDto);
         } else {
             // resource edits
-            result.edits.push(<WorkspaceFileEditDto>{ oldUri: uri, newUri: uriOrEdits, options: entry[2], metadata: entry[3] });
+            const workspaceFileEditDto: WorkspaceFileEditDto = {
+                oldResource: uri,
+                newResource: uriOrEdits,
+                options: entry[2] as types.FileOperationOptions,
+                metadata: entry[3]
+            };
+            result.edits.push(workspaceFileEditDto);
         }
     }
     return result;

package/src/plugin/types-impl.ts

@@ -213,6 +213,11 @@ export enum ExtensionMode {
     Test = 3,
 }
 
+export enum ExtensionKind {
+    UI = 1,
+    Workspace = 2
+}
+
 /**
  * Represents the validation type of the Source Control input.
  */