@theia/plugin-ext 1.35.0 → 1.36.0-next.21

package/src/main/browser/plugin-contribution-handler.ts

@@ -21,7 +21,7 @@ import { TextmateRegistry, getEncodedLanguageId, MonacoTextmateService, GrammarD
 import { MenusContributionPointHandler } from './menus/menus-contribution-handler';
 import { PluginViewRegistry } from './view/plugin-view-registry';
 import { PluginCustomEditorRegistry } from './custom-editors/plugin-custom-editor-registry';
-import { PluginContribution, IndentationRules, FoldingRules, ScopeMap, DeployedPlugin, GrammarsContribution, EnterAction, OnEnterRule } from '../../common';
+import { PluginContribution, IndentationRules, FoldingRules, ScopeMap, DeployedPlugin, GrammarsContribution, EnterAction, OnEnterRule, RegExpOptions } from '../../common';
 import {
     DefaultUriLabelProviderContribution,
     LabelProviderContribution,
@@ -488,11 +488,14 @@ export class PluginContributionHandler {
         return Disposable.NULL;
     }
 
-    private createRegex(value: string | undefined): RegExp | undefined {
+    private createRegex(value: string | RegExpOptions | undefined): RegExp | undefined {
         if (typeof value === 'string') {
             return new RegExp(value, '');
         }
-        return undefined;
+        if (typeof value == 'undefined') {
+            return undefined;
+        }
+        return new RegExp(value.pattern, value.flags);
     }
 
     private convertIndentationRules(rules?: IndentationRules): monaco.languages.IndentationRule | undefined {

package/src/main/node/handlers/plugin-theia-directory-handler.ts

@@ -34,7 +34,7 @@ export class PluginTheiaDirectoryHandler implements PluginDeployerDirectoryHandl
 
     accept(resolvedPlugin: PluginDeployerEntry): boolean {
 
-        console.log('PluginTheiaDirectoryHandler: accepting plugin with path', resolvedPlugin.path());
+        console.debug('PluginTheiaDirectoryHandler: accepting plugin with path', resolvedPlugin.path());
 
         // handle only directories
         if (resolvedPlugin.isFile()) {

package/src/plugin/plugin-context.ts

@@ -753,7 +753,8 @@ export function createAPIFactory(
 
         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 {
+            getExtension<T = any>(extensionId: string, includeFromDifferentExtensionHosts: boolean = false): theia.Extension<T> | undefined {
+                includeFromDifferentExtensionHosts = false;
                 const plg = pluginManager.getPluginById(extensionId.toLowerCase());
                 if (plg) {
                     return new PluginExt(pluginManager, plg);
@@ -764,6 +765,10 @@ export function createAPIFactory(
             get all(): readonly theia.Extension<any>[] {
                 return pluginManager.getAllPlugins().map(plg => new PluginExt(pluginManager, plg));
             },
+            get allAcrossExtensionHosts(): readonly theia.Extension<any>[] {
+                // we only support one extension host ATM so equivalent to calling "all()"
+                return this.all;
+            },
             get onDidChange(): theia.Event<void> {
                 return pluginManager.onDidChange;
             }
@@ -1369,13 +1374,15 @@ export class PluginExt<T> extends Plugin<T> implements ExtensionPlugin<T> {
     extensionPath: string;
     extensionUri: theia.Uri;
     extensionKind: ExtensionKind;
+    isFromDifferentExtensionHost: boolean;
 
-    constructor(protected override readonly pluginManager: PluginManager, plugin: InternalPlugin) {
+    constructor(protected override readonly pluginManager: PluginManager, plugin: InternalPlugin, isFromDifferentExtensionHost = false) {
         super(pluginManager, plugin);
 
         this.extensionPath = this.pluginPath;
         this.extensionUri = this.pluginUri;
         this.extensionKind = ExtensionKind.UI; // stub as a local extension (not running on a remote workspace)
+        this.isFromDifferentExtensionHost = isFromDifferentExtensionHost;
     }
 
     override get isActive(): boolean {

package/src/plugin/tree/tree-views.ts

@@ -34,7 +34,6 @@ import { URI } from '@theia/core/shared/vscode-uri';
 import { UriComponents } from '@theia/core/lib/common/uri';
 
 export class TreeViewsExtImpl implements TreeViewsExt {
-
     private proxy: TreeViewsMain;
 
     private readonly treeViews = new Map<string, TreeViewExtImpl<any>>();
@@ -45,9 +44,9 @@ export class TreeViewsExtImpl implements TreeViewsExt {
         commandRegistry.registerArgumentProcessor({
             processArgument: arg => {
                 if (TreeViewItemReference.is(arg)) {
-                    return this.toTreeItem(arg);
+                    return this.toTreeElement(arg);
                 } else if (Array.isArray(arg)) {
-                    return arg.map(param => TreeViewItemReference.is(param) ? this.toTreeItem(param) : param);
+                    return arg.map(param => TreeViewItemReference.is(param) ? this.toTreeElement(param) : param);
                 } else {
                     return arg;
                 }
@@ -62,8 +61,8 @@ export class TreeViewsExtImpl implements TreeViewsExt {
         return this.getTreeView(treeViewId).handleDrop!(treeItemId, dataTransferItems, token);
     }
 
-    protected toTreeItem(treeViewItemRef: TreeViewItemReference): any {
-        return this.treeViews.get(treeViewItemRef.viewId)?.getTreeItem(treeViewItemRef.itemId);
+    protected toTreeElement(treeViewItemRef: TreeViewItemReference): any {
+        return this.treeViews.get(treeViewItemRef.viewId)?.getElement(treeViewItemRef.itemId);
     }
 
     registerTreeDataProvider<T>(plugin: Plugin, treeViewId: string, treeDataProvider: TreeDataProvider<T>): PluginDisposable {
@@ -186,6 +185,10 @@ interface TreeExtNode<T> extends Disposable {
 }
 
 class TreeViewExtImpl<T> implements Disposable {
+    private static readonly ID_COMPUTED = 'c';
+    private static readonly ID_ITEM = 'i';
+
+    private nextItemId: 0;
 
     private readonly onDidExpandElementEmitter = new Emitter<TreeViewExpansionEvent<T>>();
     readonly onDidExpandElement = this.onDidExpandElementEmitter.event;
@@ -274,7 +277,7 @@ class TreeViewExtImpl<T> implements Disposable {
         this.proxy.$setDescription(this.treeViewId, this._description);
     }
 
-    getTreeItem(treeItemId: string): T | undefined {
+    getElement(treeItemId: string): T | undefined {
         return this.nodes.get(treeItemId)?.value;
     }
 
@@ -312,14 +315,9 @@ class TreeViewExtImpl<T> implements Disposable {
             // parent is inconsistent
             return undefined;
         }
-        const idLabel = this.getTreeItemIdLabel(treeItem);
-        let possibleIndex = children.length;
-        // find the right element id by searching all possible id names in the cache
-        while (possibleIndex-- > 0) {
-            const candidateId = this.buildTreeItemId(parentId, possibleIndex, idLabel);
-            if (this.nodes.has(candidateId)) {
-                return chain.concat(candidateId);
-            }
+        const candidateId = this.buildTreeItemId(parentId, treeItem);
+        if (this.nodes.has(candidateId)) {
+            return chain.concat(candidateId);
         }
         // couldn't calculate consistent parent chain and id
         return undefined;
@@ -335,7 +333,7 @@ class TreeViewExtImpl<T> implements Disposable {
         return typeof treeItemLabel === 'object' ? treeItemLabel.highlights : undefined;
     }
 
-    private getTreeItemIdLabel(treeItem: TreeItem): string | undefined {
+    private getItemLabel(treeItem: TreeItem): string | undefined {
         let idLabel = this.getTreeItemLabel(treeItem);
         // Use resource URI if label is not set
         if (idLabel === undefined && treeItem.resourceUri) {
@@ -348,8 +346,18 @@ class TreeViewExtImpl<T> implements Disposable {
         return idLabel;
     }
 
-    private buildTreeItemId(parentId: string, index: number, idLabel: string | undefined): string {
-        return `${parentId}/${index}:${idLabel}`;
+    private buildTreeItemId(parentId: string, item: TreeItem): string {
+        // build tree id according to https://code.visualstudio.com/api/references/vscode-api#TreeItem
+        // note: the front end tree implementation cannot handle reparenting items, hence the id is set to the "path" of individual ids
+        let id = typeof item.id === 'string' ? item.id : this.getItemLabel(item);
+        if (id) {
+            // we use '' as the id of the root, we don't consider that a valid id
+            // since '' is falsy, we'll never get '' in this branch
+            id = TreeViewExtImpl.ID_ITEM + id;
+        } else {
+            id = TreeViewExtImpl.ID_COMPUTED + this.nextItemId++;
+        }
+        return `${parentId}/${id}`;
     }
 
     async getChildren(parentId: string): Promise<TreeViewItem[] | undefined> {
@@ -369,20 +377,19 @@ class TreeViewExtImpl<T> implements Disposable {
         // ask data provider for children for cached element
         const result = await this.options.treeDataProvider.getChildren(parent);
         if (result) {
-            const treeItemPromises = result.map(async (value, index) => {
+            const treeItemPromises = result.map(async value => {
 
                 // Ask data provider for a tree item for the value
                 // Data provider must return theia.TreeItem
                 const treeItem = await this.options.treeDataProvider.getTreeItem(value);
                 // Convert theia.TreeItem to the TreeViewItem
 
-                const label = this.getTreeItemLabel(treeItem);
+                const label = this.getItemLabel(treeItem);
                 const highlights = this.getTreeItemLabelHighlights(treeItem);
-                const idLabel = this.getTreeItemIdLabel(treeItem);
 
                 // Generate the ID
                 // ID is used for caching the element
-                const id = treeItem.id || this.buildTreeItemId(parentId, index, idLabel);
+                const id = this.buildTreeItemId(parentId, treeItem);
 
                 const toDisposeElement = new DisposableCollection();
                 const node: TreeExtNode<T> = {
@@ -467,7 +474,7 @@ class TreeViewExtImpl<T> implements Disposable {
 
     async onExpanded(treeItemId: string): Promise<any> {
         // get element from a cache
-        const cachedElement = this.getTreeItem(treeItemId);
+        const cachedElement = this.getElement(treeItemId);
 
         // fire an event
         if (cachedElement) {
@@ -479,7 +486,7 @@ class TreeViewExtImpl<T> implements Disposable {
 
     async onCollapsed(treeItemId: string): Promise<any> {
         // get element from a cache
-        const cachedElement = this.getTreeItem(treeItemId);
+        const cachedElement = this.getElement(treeItemId);
 
         // fire an event
         if (cachedElement) {
@@ -513,7 +520,7 @@ class TreeViewExtImpl<T> implements Disposable {
     get selectedElements(): T[] {
         const items: T[] = [];
         for (const id of this.selectedItemIds) {
-            const item = this.getTreeItem(id);
+            const item = this.getElement(id);
             if (item) {
                 items.push(item);
             }
@@ -554,7 +561,7 @@ class TreeViewExtImpl<T> implements Disposable {
     async onDragStarted(treeItemIds: string[], token: CancellationToken): Promise<UriComponents[] | undefined> {
         const treeItems: T[] = [];
         for (const id of treeItemIds) {
-            const item = this.getTreeItem(id);
+            const item = this.getElement(id);
             if (item) {
                 treeItems.push(item);
             }
@@ -571,7 +578,7 @@ class TreeViewExtImpl<T> implements Disposable {
     }
 
     async handleDrop(treeItemId: string | undefined, dataTransferItems: [string, string | DataTransferFileDTO][], token: CancellationToken): Promise<void> {
-        const treeItem = treeItemId ? this.getTreeItem(treeItemId) : undefined;
+        const treeItem = treeItemId ? this.getElement(treeItemId) : undefined;
         const dropTransfer = new DataTransfer();
         if (this.options.dragAndDropController?.handleDrop) {
             this.localDataTransfer.forEach((item, type) => {

package/src/plugin/types-impl.ts

@@ -404,10 +404,13 @@ export class Position {
         return result!;
     }
 
-    static isPosition(other: {}): other is Position {
+    static isPosition(other: unknown): other is Position {
         if (!other) {
             return false;
         }
+        if (typeof other !== 'object' || Array.isArray(other)) {
+            return false;
+        }
         if (other instanceof Position) {
             return true;
         }

package/src/plugin/webview-views.ts

@@ -167,8 +167,8 @@ export class WebviewViewExtImpl implements theia.WebviewView {
 
     set title(value: string | undefined) {
         this.assertNotDisposed();
-        if (this.title !== value) {
-            this.title = value;
+        if (this._title !== value) {
+            this._title = value;
             this.proxy.$setWebviewViewTitle(this.handle, value);
         }
     }