@theia/plugin-ext 1.34.0-next.7 → 1.34.1

package/src/main/browser/webview/pre/main.js

@@ -67,78 +67,78 @@
     };
 
     const defaultCssRules = `
-	body {
-		background-color: var(--vscode-editor-background);
-		color: var(--vscode-editor-foreground);
-		font-family: var(--vscode-font-family);
-		font-weight: var(--vscode-font-weight);
-		font-size: var(--vscode-font-size);
-		margin: 0;
-		padding: 0 20px;
-	}
-
-	img {
-		max-width: 100%;
-		max-height: 100%;
-	}
-
-	a {
-		color: var(--vscode-textLink-foreground);
-	}
-
-	a:hover {
-		color: var(--vscode-textLink-activeForeground);
-	}
-
-	a:focus,
-	input:focus,
-	select:focus,
-	textarea:focus {
-		outline: 1px solid -webkit-focus-ring-color;
-		outline-offset: -1px;
-	}
-
-	code {
-		color: var(--vscode-textPreformat-foreground);
-	}
-
-	blockquote {
-		background: var(--vscode-textBlockQuote-background);
-		border-color: var(--vscode-textBlockQuote-border);
-	}
-
-	kbd {
-		color: var(--vscode-editor-foreground);
-		border-radius: 3px;
-		vertical-align: middle;
-		padding: 1px 3px;
-
-		background-color: hsla(0,0%,50%,.17);
-		border: 1px solid rgba(71,71,71,.4);
-		border-bottom-color: rgba(88,88,88,.4);
-		box-shadow: inset 0 -1px 0 rgba(88,88,88,.4);
-	}
-	.vscode-light kbd {
-		background-color: hsla(0,0%,87%,.5);
-		border: 1px solid hsla(0,0%,80%,.7);
-		border-bottom-color: hsla(0,0%,73%,.7);
-		box-shadow: inset 0 -1px 0 hsla(0,0%,73%,.7);
-	}
-
-	::-webkit-scrollbar {
-		width: 10px;
-		height: 10px;
-	}
-
-	::-webkit-scrollbar-thumb {
-		background-color: var(--vscode-scrollbarSlider-background);
-	}
-	::-webkit-scrollbar-thumb:hover {
-		background-color: var(--vscode-scrollbarSlider-hoverBackground);
-	}
-	::-webkit-scrollbar-thumb:active {
-		background-color: var(--vscode-scrollbarSlider-activeBackground);
-	}`;
+    body {
+        background-color: var(--vscode-editor-background);
+        color: var(--vscode-editor-foreground);
+        font-family: var(--vscode-font-family);
+        font-weight: var(--vscode-font-weight);
+        font-size: var(--vscode-font-size);
+        margin: 0;
+        padding: 0 20px;
+    }
+
+    img {
+        max-width: 100%;
+        max-height: 100%;
+    }
+
+    a {
+        color: var(--vscode-textLink-foreground);
+    }
+
+    a:hover {
+        color: var(--vscode-textLink-activeForeground);
+    }
+
+    a:focus,
+    input:focus,
+    select:focus,
+    textarea:focus {
+        outline: 1px solid -webkit-focus-ring-color;
+        outline-offset: -1px;
+    }
+
+    code {
+        color: var(--vscode-textPreformat-foreground);
+    }
+
+    blockquote {
+        background: var(--vscode-textBlockQuote-background);
+        border-color: var(--vscode-textBlockQuote-border);
+    }
+
+    kbd {
+        color: var(--vscode-editor-foreground);
+        border-radius: 3px;
+        vertical-align: middle;
+        padding: 1px 3px;
+
+        background-color: hsla(0,0%,50%,.17);
+        border: 1px solid rgba(71,71,71,.4);
+        border-bottom-color: rgba(88,88,88,.4);
+        box-shadow: inset 0 -1px 0 rgba(88,88,88,.4);
+    }
+    .vscode-light kbd {
+        background-color: hsla(0,0%,87%,.5);
+        border: 1px solid hsla(0,0%,80%,.7);
+        border-bottom-color: hsla(0,0%,73%,.7);
+        box-shadow: inset 0 -1px 0 hsla(0,0%,73%,.7);
+    }
+
+    ::-webkit-scrollbar {
+        width: 10px;
+        height: 10px;
+    }
+
+    ::-webkit-scrollbar-thumb {
+        background-color: var(--vscode-scrollbarSlider-background);
+    }
+    ::-webkit-scrollbar-thumb:hover {
+        background-color: var(--vscode-scrollbarSlider-hoverBackground);
+    }
+    ::-webkit-scrollbar-thumb:active {
+        background-color: var(--vscode-scrollbarSlider-activeBackground);
+    }`;
 
     /**
      * @param {*} [state]
@@ -146,38 +146,38 @@
      */
     function getVsCodeApiScript(state) {
         return `
-			const acquireVsCodeApi = (function() {
-				const originalPostMessage = window.parent.postMessage.bind(window.parent);
-				const targetOrigin = '*';
-				let acquired = false;
-
-				let state = ${state ? `JSON.parse(${JSON.stringify(state)})` : undefined};
-
-				return () => {
-					if (acquired) {
-						throw new Error('An instance of the VS Code API has already been acquired');
-					}
-					acquired = true;
-					return Object.freeze({
-						postMessage: function(msg) {
-							return originalPostMessage({ command: 'onmessage', data: msg }, targetOrigin);
-						},
-						setState: function(newState) {
-							state = newState;
-							originalPostMessage({ command: 'do-update-state', data: JSON.stringify(newState) }, targetOrigin);
-							return newState;
-						},
-						getState: function() {
-							return state;
-						}
-					});
-				};
-			})();
-            const acquireTheiaApi = acquireVsCodeApi;
-			delete window.parent;
-			delete window.top;
-			delete window.frameElement;
-		`;
+        const acquireVsCodeApi = (function() {
+            const originalPostMessage = window.parent.postMessage.bind(window.parent);
+            const targetOrigin = '*';
+            let acquired = false;
+
+            let state = ${state ? `JSON.parse(${JSON.stringify(state)})` : undefined};
+
+            return () => {
+                if (acquired) {
+                    throw new Error('An instance of the VS Code API has already been acquired');
+                }
+                acquired = true;
+                return Object.freeze({
+                    postMessage: function(msg) {
+                        return originalPostMessage({ command: 'onmessage', data: msg }, targetOrigin);
+                    },
+                    setState: function(newState) {
+                        state = newState;
+                        originalPostMessage({ command: 'do-update-state', data: JSON.stringify(newState) }, targetOrigin);
+                        return newState;
+                    },
+                    getState: function() {
+                        return state;
+                    }
+                });
+            };
+        })();
+        const acquireTheiaApi = acquireVsCodeApi;
+        delete window.parent;
+        delete window.top;
+        delete window.frameElement;
+        `;
     }
 
     /**
@@ -381,20 +381,21 @@
 
             applyStyles(newDocument, newDocument.body);
 
+            const sameOrigin = '\'self\'';  // see: https://content-security-policy.com/self/
             // Check for CSP
             const csp = newDocument.querySelector('meta[http-equiv="Content-Security-Policy"]');
-            if (!csp) {
-                host.postMessage('no-csp-found');
-            } else {
-                // Rewrite vscode-resource in csp
-                if (data.endpoint) {
+            if (csp !== null) {
+                const cspContent = csp.getAttribute('content');
+                if (cspContent !== null) {
+                    // Rewrite vscode-resource in csp
                     try {
-                        const endpointUrl = new URL(data.endpoint);
-                        csp.setAttribute('content', csp.getAttribute('content').replace(/(?:vscode|theia)-resource:(?=(\s|;|$))/g, endpointUrl.origin));
+                        csp.setAttribute('content', cspContent.replace(/(vscode-webview-resource|vscode-resource):(?=(\s|;|$))/g, sameOrigin));
                     } catch (e) {
                         console.error('Could not rewrite csp');
                     }
                 }
+            } else {
+                host.postMessage('no-csp-found');
             }
 
             // set DOCTYPE for newDocument explicitly as DOMParser.parseFromString strips it off

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

@@ -76,7 +76,7 @@ export interface WebviewContentOptions {
     readonly allowForms?: boolean;
     readonly localResourceRoots?: ReadonlyArray<string>;
     readonly portMapping?: ReadonlyArray<WebviewPortMapping>;
-    readonly enableCommandUris?: boolean;
+    readonly enableCommandUris?: boolean | readonly string[];
 }
 
 @injectable()
@@ -450,8 +450,12 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
             }
             return link;
         }
-        if (!!this.contentOptions.enableCommandUris && link.scheme === Schemes.command) {
-            return link;
+        if (link.scheme === Schemes.command) {
+            if (Array.isArray(this.contentOptions.enableCommandUris) && this.contentOptions.enableCommandUris.some(value => value === link.path.toString())) {
+                return link;
+            } else if (this.contentOptions.enableCommandUris === true) {
+                return link;
+            }
         }
         return undefined;
     }

package/src/plugin/debug/debug-ext.ts

@@ -67,6 +67,7 @@ export class DebugExtImpl implements DebugExt {
     private readonly onDidChangeBreakpointsEmitter = new Emitter<theia.BreakpointsChangeEvent>();
     private readonly onDidChangeActiveDebugSessionEmitter = new Emitter<theia.DebugSession | undefined>();
     private readonly onDidTerminateDebugSessionEmitter = new Emitter<theia.DebugSession>();
+    private readonly onDidCreateDebugSessionEmitter = new Emitter<theia.DebugSession>();
     private readonly onDidStartDebugSessionEmitter = new Emitter<theia.DebugSession>();
     private readonly onDidReceiveDebugSessionCustomEmitter = new Emitter<theia.DebugSessionCustomEvent>();
 
@@ -131,6 +132,10 @@ export class DebugExtImpl implements DebugExt {
         return this.onDidTerminateDebugSessionEmitter.event;
     }
 
+    get onDidCreateDebugSession(): theia.Event<theia.DebugSession> {
+        return this.onDidCreateDebugSessionEmitter.event;
+    }
+
     get onDidStartDebugSession(): theia.Event<theia.DebugSession> {
         return this.onDidStartDebugSessionEmitter.event;
     }
@@ -253,6 +258,13 @@ export class DebugExtImpl implements DebugExt {
     }
 
     async $sessionDidCreate(sessionId: string): Promise<void> {
+        const session = this.sessions.get(sessionId);
+        if (session) {
+            this.onDidCreateDebugSessionEmitter.fire(session);
+        }
+    }
+
+    async $sessionDidStart(sessionId: string): Promise<void> {
         const session = this.sessions.get(sessionId);
         if (session) {
             this.onDidStartDebugSessionEmitter.fire(session);

package/src/plugin/languages/code-action.ts

@@ -24,6 +24,7 @@ import { Diagnostics } from './diagnostics';
 import { CodeActionKind } from '../types-impl';
 import { CommandRegistryImpl } from '../command-registry';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { isObject } from '@theia/core/lib/common';
 
 export class CodeActionAdapter {
 
@@ -147,16 +148,15 @@ export class CodeActionAdapter {
     }
 
     private static _isCommand(arg: unknown): arg is theia.Command {
-        return !!arg && typeof arg === 'object' && typeof (arg as theia.Command).command === 'string';
+        return isObject<theia.Command>(arg) && typeof arg.command === 'string';
     }
 
-    private static _isSelection(obj: unknown): obj is Selection {
-        const selection = obj as Selection;
-        return !!obj && typeof obj === 'object'
-            && typeof selection.selectionStartLineNumber === 'number'
-            && typeof selection.selectionStartColumn === 'number'
-            && typeof selection.positionLineNumber === 'number'
-            && typeof selection.positionColumn === 'number';
+    private static _isSelection(arg: unknown): arg is Selection {
+        return isObject<Selection>(arg)
+            && typeof arg.selectionStartLineNumber === 'number'
+            && typeof arg.selectionStartColumn === 'number'
+            && typeof arg.positionLineNumber === 'number'
+            && typeof arg.positionColumn === 'number';
     }
 
 }

package/src/plugin/plugin-context.ts

@@ -61,6 +61,7 @@ import {
     CompletionItemKind,
     CompletionList,
     TextEdit,
+    SnippetTextEdit,
     CompletionTriggerKind,
     Diagnostic,
     DiagnosticRelatedInformation,
@@ -92,6 +93,8 @@ import {
     CodeActionTriggerKind,
     TextDocumentSaveReason,
     CodeAction,
+    DataTransferItem,
+    DataTransfer,
     TreeItem,
     TreeItemCollapsibleState,
     DocumentSymbol,
@@ -152,6 +155,8 @@ import {
     TextDocumentChangeReason,
     InputBoxValidationSeverity,
     TerminalLink,
+    TerminalLocation,
+    TerminalProfile,
     InlayHint,
     InlayHintKind,
     InlayHintLabelPart,
@@ -520,7 +525,7 @@ export function createAPIFactory(
             registerTreeDataProvider<T>(viewId: string, treeDataProvider: theia.TreeDataProvider<T>): Disposable {
                 return treeViewsExt.registerTreeDataProvider(plugin, viewId, treeDataProvider);
             },
-            createTreeView<T>(viewId: string, options: { treeDataProvider: theia.TreeDataProvider<T> }): theia.TreeView<T> {
+            createTreeView<T>(viewId: string, options: theia.TreeViewOptions<T>): theia.TreeView<T> {
                 return treeViewsExt.createTreeView(plugin, viewId, options);
             },
             withScmProgress<R>(task: (progress: theia.Progress<number>) => Thenable<R>) {
@@ -546,6 +551,9 @@ export function createAPIFactory(
             registerTerminalLinkProvider(provider: theia.TerminalLinkProvider): theia.Disposable {
                 return terminalExt.registerTerminalLinkProvider(provider);
             },
+            registerTerminalProfileProvider(id: string, provider: theia.TerminalProfileProvider): theia.Disposable {
+                return terminalExt.registerTerminalProfileProvider(id, provider);
+            },
             get activeColorTheme(): theia.ColorTheme {
                 return themingExt.activeColorTheme;
             },
@@ -1088,7 +1096,7 @@ export function createAPIFactory(
                         notebook: theia.NotebookDocument,
                         controller: theia.NotebookController
                     ): (void | Thenable<void>) { },
-                    onDidChangeSelectedNotebooks: () => Disposable.create(() => {}),
+                    onDidChangeSelectedNotebooks: () => Disposable.create(() => { }),
                     updateNotebookAffinity: (notebook: theia.NotebookDocument, affinity: theia.NotebookControllerAffinity) => undefined,
                     dispose: () => undefined,
                 };
@@ -1099,7 +1107,7 @@ export function createAPIFactory(
             ) {
                 return {
                     rendererId,
-                    onDidReceiveMessage: () => Disposable.create(() => {} ),
+                    onDidReceiveMessage: () => Disposable.create(() => { }),
                     postMessage: () => Promise.resolve({}),
                 };
             },
@@ -1169,6 +1177,7 @@ export function createAPIFactory(
             Diagnostic,
             CompletionTriggerKind,
             TextEdit,
+            SnippetTextEdit,
             ProgressLocation,
             ProgressOptions,
             Progress,
@@ -1192,6 +1201,8 @@ export function createAPIFactory(
             CodeActionTriggerKind,
             TextDocumentSaveReason,
             CodeAction,
+            DataTransferItem,
+            DataTransfer,
             TreeItem,
             TreeItemCollapsibleState,
             SymbolKind,
@@ -1249,6 +1260,7 @@ export function createAPIFactory(
             SourceControlInputBoxValidationType,
             FileDecoration,
             TerminalLink,
+            TerminalProfile,
             CancellationError,
             ExtensionMode,
             LinkedEditingRanges,
@@ -1284,6 +1296,7 @@ export function createAPIFactory(
             TabInputNotebookDiff: NotebookDiffEditorTabInput,
             TabInputWebview: WebviewEditorTabInput,
             TabInputTerminal: TerminalEditorTabInput,
+            TerminalLocation
         };
     };
 }

package/src/plugin/plugin-manager.ts

@@ -89,6 +89,7 @@ export class PluginManagerExtImpl implements PluginManagerExt, PluginManager {
         'workspaceContains',
         'onView',
         'onUri',
+        'onTerminalProfile',
         'onWebviewPanel',
         'onFileSystem',
         'onCustomEditor',

package/src/plugin/preference-registry.ts

@@ -170,7 +170,9 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
             },
             update: (key: string, value: any, targetScope?: ConfigurationTarget | boolean, withLanguageOverride?: boolean): PromiseLike<void> => {
                 const resourceStr = overrides.resource?.toString();
-                const fullPath = `${overrides.overrideIdentifier ? `[${overrides.overrideIdentifier}].` : ''}${rawSection}.${key}`;
+                const overrideSegment = overrides.overrideIdentifier ? `[${overrides.overrideIdentifier}].` : '';
+                const preferenceKey = rawSection ? `${rawSection}.${key}` : key;
+                const fullPath = overrideSegment + preferenceKey;
                 if (typeof value !== 'undefined') {
                     return this.proxy.$updateConfigurationOption(targetScope, fullPath, value, resourceStr, withLanguageOverride);
                 } else {
@@ -178,7 +180,7 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
                 }
             },
             inspect: <T>(key: string): ConfigurationInspect<T> | undefined => {
-                const path = `${rawSection}.${key}`;
+                const path = rawSection ? `${rawSection}.${key}` : key;
                 const result = this._preferences.inspect<T>(path, overrides, new TheiaWorkspace(this.workspace));
 
                 if (!result) {

package/src/plugin/quick-open.ts

@@ -543,6 +543,7 @@ export class InputBoxExt extends QuickInputExt implements theia.InputBox {
 
     private _password: boolean;
     private _prompt: string | undefined;
+    private _valueSelection: readonly [number, number] | undefined;
     private _validationMessage: string | undefined;
 
     constructor(
@@ -576,6 +577,15 @@ export class InputBoxExt extends QuickInputExt implements theia.InputBox {
         this.update({ prompt });
     }
 
+    get valueSelection(): readonly [number, number] | undefined {
+        return this._valueSelection;
+    }
+
+    set valueSelection(valueSelection: readonly [number, number] | undefined) {
+        this._valueSelection = valueSelection;
+        this.update({ valueSelection });
+    }
+
     get validationMessage(): string | undefined {
         return this._validationMessage;
     }

package/src/plugin/scm.ts

@@ -322,6 +322,17 @@ export class ScmInputBoxImpl implements theia.SourceControlInputBox {
         this._visible = visible;
     }
 
+    private _enabled: boolean;
+
+    get enabled(): boolean {
+        return this._enabled;
+    }
+
+    set enabled(enabled: boolean) {
+        this.proxy.$setInputBoxEnabled(this.sourceControlHandle, enabled);
+        this._enabled = enabled;
+    }
+
     private _validateInput: ValidateInput | undefined;
 
     get validateInput(): ValidateInput | undefined {

package/src/plugin/tabs.ts

@@ -291,14 +291,6 @@ export class TabsExtImpl implements TabsExt {
                         return this._closeTabs(tabsOrTabGroups as theia.Tab[], preserveFocus);
                     }
                 },
-                // move: async (tab: theia.Tab, viewColumn: ViewColumn, index: number, preserveFocus?: boolean) => {
-                //  const extHostTab = this._findExtHostTabFromApi(tab);
-                //  if (!extHostTab) {
-                //      throw new Error('Invalid tab');
-                //  }
-                //  this._proxy.$moveTab(extHostTab.tabId, index, typeConverters.ViewColumn.from(viewColumn), preserveFocus);
-                //  return;
-                // }
             };
             this.apiObject = Object.freeze(obj);
         }
@@ -306,7 +298,6 @@ export class TabsExtImpl implements TabsExt {
     }
 
     $acceptEditorTabModel(tabGroups: TabGroupDto[]): void {
-
         const groupIdsBefore = new Set(this.tabGroupArr.map(group => group.groupId));
         const groupIdsAfter = new Set(tabGroups.map(dto => dto.groupId));
         const diff = diffSets(groupIdsBefore, groupIdsAfter);
@@ -314,23 +305,28 @@ export class TabsExtImpl implements TabsExt {
         const closed: theia.TabGroup[] = this.tabGroupArr.filter(group => diff.removed.includes(group.groupId)).map(group => group.apiObject);
         const opened: theia.TabGroup[] = [];
         const changed: theia.TabGroup[] = [];
+        const tabsOpened: theia.Tab[] = [];
 
         this.tabGroupArr = tabGroups.map(tabGroup => {
             const group = new TabGroupExt(tabGroup, () => this.activeGroupId);
             if (diff.added.includes(group.groupId)) {
-                opened.push(group.apiObject);
+                opened.push({ activeTab: undefined, isActive: group.apiObject.isActive, tabs: [], viewColumn: group.apiObject.viewColumn });
+                tabsOpened.push(...group.apiObject.tabs);
             } else {
                 changed.push(group.apiObject);
             }
             return group;
         });
 
-        // Set the active tab group id
-        const activeTabGroupId = assertIsDefined(tabGroups.find(group => group.isActive === true)?.groupId);
-        if (activeTabGroupId !== undefined && this.activeGroupId !== activeTabGroupId) {
-            this.activeGroupId = activeTabGroupId;
+        // Set the active tab group id. skip if no tabgroups are open
+        if (tabGroups.length > 0) {
+            const activeTabGroupId = assertIsDefined(tabGroups.find(group => group.isActive === true)?.groupId);
+            if (this.activeGroupId !== activeTabGroupId) {
+                this.activeGroupId = activeTabGroupId;
+            }
         }
         this.onDidChangeTabGroups.fire(Object.freeze({ opened, closed, changed }));
+        this.onDidChangeTabs.fire({ opened: tabsOpened, changed: [], closed: [] });
     }
 
     $acceptTabGroupUpdate(groupDto: TabGroupDto): void {
@@ -406,7 +402,7 @@ export class TabsExtImpl implements TabsExt {
         return this.proxy.$closeTab(extHostTabIds, preserveFocus);
     }
 
-    private async _closeGroups(groups: theia.TabGroup[], preserverFoucs?: boolean): Promise<boolean> {
+    private async _closeGroups(groups: theia.TabGroup[], preserveFocus?: boolean): Promise<boolean> {
         const extHostGroupIds: number[] = [];
         for (const group of groups) {
             const extHostGroup = this._findExtHostTabGroupFromApi(group);
@@ -415,7 +411,7 @@ export class TabsExtImpl implements TabsExt {
             }
             extHostGroupIds.push(extHostGroup.groupId);
         }
-        return this.proxy.$closeGroup(extHostGroupIds, preserverFoucs);
+        return this.proxy.$closeGroup(extHostGroupIds, preserveFocus);
     }
 }