npm - @theia/plugin-ext - Versions diffs - 1.34.0 → 1.34.2 - Mend

@theia/plugin-ext 1.34.0 → 1.34.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/lib/common/plugin-api-rpc.d.ts +1 -1
package/lib/common/plugin-api-rpc.d.ts.map +1 -1
package/lib/main/browser/main-context.d.ts.map +1 -1
package/lib/main/browser/main-context.js +3 -0
package/lib/main/browser/main-context.js.map +1 -1
package/lib/main/browser/tabs/tabs-main.d.ts +33 -2
package/lib/main/browser/tabs/tabs-main.d.ts.map +1 -1
package/lib/main/browser/tabs/tabs-main.js +256 -6
package/lib/main/browser/tabs/tabs-main.js.map +1 -1
package/lib/plugin/tabs.d.ts.map +1 -1
package/lib/plugin/tabs.js +10 -13
package/lib/plugin/tabs.js.map +1 -1
package/lib/plugin/tree/tree-views.d.ts +6 -3
package/lib/plugin/tree/tree-views.d.ts.map +1 -1
package/lib/plugin/tree/tree-views.js +32 -25
package/lib/plugin/tree/tree-views.js.map +1 -1
package/package.json +27 -26
package/src/common/plugin-api-rpc.ts +1 -1
package/src/main/browser/main-context.ts +4 -0
package/src/main/browser/tabs/tabs-main.ts +287 -6
package/src/plugin/tabs.ts +10 -14
package/src/plugin/tree/tree-views.ts +33 -26

package/lib/main/browser/tabs/tabs-main.js CHANGED Viewed

@@ -15,19 +15,269 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TabsMainImp = void 0;
-class TabsMainImp {
-    constructor(rpc, container) { }
+exports.TabsMainImpl = void 0;
+const browser_1 = require("@theia/core/lib/browser");
+const plugin_api_rpc_1 = require("../../../common/plugin-api-rpc");
+const editor_preview_widget_1 = require("@theia/editor-preview/lib/browser/editor-preview-widget");
+const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
+const monaco_diff_editor_1 = require("@theia/monaco/lib/browser/monaco-diff-editor");
+const hierarchy_types_converters_1 = require("../hierarchy/hierarchy-types-converters");
+const terminal_widget_1 = require("@theia/terminal/lib/browser/base/terminal-widget");
+const core_1 = require("@theia/core");
+class TabsMainImpl {
+    constructor(rpc, container) {
+        this.tabGroupModel = new Map();
+        this.tabInfoLookup = new Map();
+        this.disposableTabBarListeners = new core_1.DisposableCollection();
+        this.toDisposeOnDestroy = new core_1.DisposableCollection();
+        this.groupIdCounter = 0;
+        this.tabGroupChanged = false;
+        this.proxy = rpc.getProxy(plugin_api_rpc_1.MAIN_RPC_CONTEXT.TABS_EXT);
+        this.applicationShell = container.get(browser_1.ApplicationShell);
+        this.createTabsModel();
+        const tabBars = this.applicationShell.mainPanel.tabBars();
+        for (let tabBar; tabBar = tabBars.next();) {
+            this.attachListenersToTabBar(tabBar);
+        }
+        this.toDisposeOnDestroy.push(this.applicationShell.mainPanelRenderer.onDidCreateTabBar(tabBar => {
+            this.attachListenersToTabBar(tabBar);
+            this.onTabGroupCreated(tabBar);
+        }));
+        this.connectToSignal(this.toDisposeOnDestroy, this.applicationShell.mainPanel.widgetAdded, (mainPanel, widget) => {
+            if (this.tabGroupChanged || this.tabGroupModel.size === 0) {
+                this.tabGroupChanged = false;
+                this.createTabsModel();
+                // tab Open event is done in backend
+            }
+            else {
+                const tabBar = mainPanel.findTabBar(widget.title);
+                const oldTabInfo = this.tabInfoLookup.get(widget.title);
+                const group = this.tabGroupModel.get(tabBar);
+                if (group !== (oldTabInfo === null || oldTabInfo === void 0 ? void 0 : oldTabInfo.group)) {
+                    if (oldTabInfo) {
+                        this.onTabClosed(oldTabInfo, widget.title);
+                    }
+                    this.onTabCreated(tabBar, { index: tabBar.titles.indexOf(widget.title), title: widget.title });
+                }
+            }
+        });
+        this.connectToSignal(this.toDisposeOnDestroy, this.applicationShell.mainPanel.widgetRemoved, (mainPanel, widget) => {
+            if (!(widget instanceof browser_1.TabBar)) {
+                const tabInfo = this.getOrRebuildModel(this.tabInfoLookup, widget.title);
+                this.onTabClosed(tabInfo, widget.title);
+                if (this.tabGroupChanged) {
+                    this.tabGroupChanged = false;
+                    this.createTabsModel();
+                }
+            }
+        });
+    }
+    createTabsModel() {
+        var _a, _b;
+        const newTabGroupModel = new Map();
+        this.tabInfoLookup.clear();
+        this.disposableTabBarListeners.dispose();
+        this.applicationShell.mainAreaTabBars.forEach(tabBar => {
+            this.attachListenersToTabBar(tabBar);
+            const groupDto = this.createTabGroupDto(tabBar);
+            tabBar.titles.forEach((title, index) => this.tabInfoLookup.set(title, { group: groupDto, tab: groupDto.tabs[index], tabIndex: index }));
+            newTabGroupModel.set(tabBar, groupDto);
+        });
+        if (newTabGroupModel.size > 0 && Array.from(newTabGroupModel.values()).indexOf(this.currentActiveGroup) < 0) {
+            this.currentActiveGroup = (_b = (_a = this.tabInfoLookup.get(this.applicationShell.mainPanel.currentTitle)) === null || _a === void 0 ? void 0 : _a.group) !== null && _b !== void 0 ? _b : newTabGroupModel.values().next().value;
+            this.currentActiveGroup.isActive = true;
+        }
+        this.tabGroupModel = newTabGroupModel;
+        this.proxy.$acceptEditorTabModel(Array.from(this.tabGroupModel.values()));
+    }
+    createTabDto(tabTitle, groupId) {
+        const widget = tabTitle.owner;
+        return {
+            id: this.createTabId(tabTitle, groupId),
+            label: tabTitle.label,
+            input: this.evaluateTabDtoInput(widget),
+            isActive: tabTitle.owner.isVisible,
+            isPinned: tabTitle.className.includes(browser_1.PINNED_CLASS),
+            isDirty: browser_1.Saveable.isDirty(widget),
+            isPreview: widget instanceof editor_preview_widget_1.EditorPreviewWidget && widget.isPreview
+        };
+    }
+    createTabId(tabTitle, groupId) {
+        return `${groupId}~${tabTitle.owner.id}`;
+    }
+    createTabGroupDto(tabBar) {
+        var _a;
+        const oldDto = this.tabGroupModel.get(tabBar);
+        const groupId = (_a = oldDto === null || oldDto === void 0 ? void 0 : oldDto.groupId) !== null && _a !== void 0 ? _a : this.groupIdCounter++;
+        const tabs = tabBar.titles.map(title => this.createTabDto(title, groupId));
+        return {
+            groupId,
+            tabs,
+            isActive: false,
+            viewColumn: 1
+        };
+    }
+    attachListenersToTabBar(tabBar) {
+        if (!tabBar) {
+            return;
+        }
+        tabBar.titles.forEach(title => {
+            this.connectToSignal(this.disposableTabBarListeners, title.changed, this.onTabTitleChanged);
+        });
+        this.connectToSignal(this.disposableTabBarListeners, tabBar.tabMoved, this.onTabMoved);
+        this.connectToSignal(this.disposableTabBarListeners, tabBar.disposed, this.onTabGroupClosed);
+    }
+    evaluateTabDtoInput(widget) {
+        if (widget instanceof editor_preview_widget_1.EditorPreviewWidget) {
+            if (widget.editor instanceof monaco_diff_editor_1.MonacoDiffEditor) {
+                return {
+                    kind: 2 /* TextDiffInput */,
+                    original: (0, hierarchy_types_converters_1.toUriComponents)(widget.editor.originalModel.uri),
+                    modified: (0, hierarchy_types_converters_1.toUriComponents)(widget.editor.modifiedModel.uri)
+                };
+            }
+            else {
+                return {
+                    kind: 1 /* TextInput */,
+                    uri: (0, hierarchy_types_converters_1.toUriComponents)(widget.editor.uri.toString())
+                };
+            }
+            // TODO notebook support when implemented
+        }
+        else if (widget instanceof browser_1.ViewContainer) {
+            return {
+                kind: 7 /* WebviewEditorInput */,
+                viewType: widget.id
+            };
+        }
+        else if (widget instanceof terminal_widget_1.TerminalWidget) {
+            return {
+                kind: 8 /* TerminalEditorInput */
+            };
+        }
+        return { kind: 0 /* UnknownInput */ };
+    }
+    connectToSignal(disposableList, signal, listener) {
+        signal.connect(listener, this);
+        disposableList.push(vscode_languageserver_protocol_1.Disposable.create(() => signal.disconnect(listener)));
+    }
+    tabDtosEqual(a, b) {
+        return a.isActive === b.isActive &&
+            a.isDirty === b.isDirty &&
+            a.isPinned === b.isPinned &&
+            a.isPreview === b.isPreview &&
+            a.id === b.id;
+    }
+    getOrRebuildModel(map, key) {
+        // something broke so we rebuild the model
+        let item = map.get(key);
+        if (!item) {
+            this.createTabsModel();
+            item = map.get(key);
+        }
+        return item;
+    }
+    // #region event listeners
+    onTabCreated(tabBar, args) {
+        const group = this.getOrRebuildModel(this.tabGroupModel, tabBar);
+        this.connectToSignal(this.disposableTabBarListeners, args.title.changed, this.onTabTitleChanged);
+        const tabDto = this.createTabDto(args.title, group.groupId);
+        this.tabInfoLookup.set(args.title, { group, tab: tabDto, tabIndex: args.index });
+        group.tabs.splice(args.index, 0, tabDto);
+        this.proxy.$acceptTabOperation({
+            kind: 0 /* TAB_OPEN */,
+            index: args.index,
+            tabDto,
+            groupId: group.groupId
+        });
+    }
+    onTabTitleChanged(title) {
+        const tabInfo = this.getOrRebuildModel(this.tabInfoLookup, title);
+        if (!tabInfo) {
+            return;
+        }
+        const oldTabDto = tabInfo.tab;
+        const newTabDto = this.createTabDto(title, tabInfo.group.groupId);
+        if (newTabDto.isActive && !tabInfo.group.isActive) {
+            tabInfo.group.isActive = true;
+            this.currentActiveGroup.isActive = false;
+            this.currentActiveGroup = tabInfo.group;
+            this.proxy.$acceptTabGroupUpdate(tabInfo.group);
+        }
+        if (!this.tabDtosEqual(oldTabDto, newTabDto)) {
+            tabInfo.group.tabs[tabInfo.tabIndex] = newTabDto;
+            tabInfo.tab = newTabDto;
+            this.proxy.$acceptTabOperation({
+                kind: 2 /* TAB_UPDATE */,
+                index: tabInfo.tabIndex,
+                tabDto: newTabDto,
+                groupId: tabInfo.group.groupId
+            });
+        }
+    }
+    onTabClosed(tabInfo, title) {
+        tabInfo.group.tabs.splice(tabInfo.tabIndex, 1);
+        this.tabInfoLookup.delete(title);
+        this.proxy.$acceptTabOperation({
+            kind: 1 /* TAB_CLOSE */,
+            index: tabInfo.tabIndex,
+            tabDto: this.createTabDto(title, tabInfo.group.groupId),
+            groupId: tabInfo.group.groupId
+        });
+    }
+    onTabMoved(tabBar, args) {
+        const tabInfo = this.getOrRebuildModel(this.tabInfoLookup, args.title);
+        tabInfo.tabIndex = args.toIndex;
+        const tabDto = this.createTabDto(args.title, tabInfo.group.groupId);
+        tabInfo.group.tabs.splice(args.fromIndex, 1);
+        tabInfo.group.tabs.splice(args.toIndex, 0, tabDto);
+        this.proxy.$acceptTabOperation({
+            kind: 3 /* TAB_MOVE */,
+            index: args.toIndex,
+            tabDto,
+            groupId: tabInfo.group.groupId,
+            oldIndex: args.fromIndex
+        });
+    }
+    onTabGroupCreated(tabBar) {
+        this.tabGroupChanged = true;
+    }
+    onTabGroupClosed(tabBar) {
+        this.tabGroupChanged = true;
+    }
+    // #endregion
     // #region Messages received from Ext Host
     $moveTab(tabId, index, viewColumn, preserveFocus) {
         return;
     }
     async $closeTab(tabIds, preserveFocus) {
-        return false;
+        const widgets = [];
+        for (const tabId of tabIds) {
+            const cleanedId = tabId.substring(tabId.indexOf('~') + 1);
+            const widget = this.applicationShell.getWidgetById(cleanedId);
+            if (widget) {
+                widgets.push(widget);
+            }
+        }
+        await this.applicationShell.closeMany(widgets);
+        return true;
     }
     async $closeGroup(groupIds, preserveFocus) {
-        return false;
+        for (const groupId of groupIds) {
+            tabGroupModel: for (const [bar, groupDto] of this.tabGroupModel) {
+                if (groupDto.groupId === groupId) {
+                    this.applicationShell.closeTabs(bar);
+                    break tabGroupModel;
+                }
+            }
+        }
+        return true;
+    }
+    // #endregion
+    dispose() {
+        this.toDisposeOnDestroy.dispose();
+        this.disposableTabBarListeners.dispose();
     }
 }
-exports.TabsMainImp = TabsMainImp;
+exports.TabsMainImpl = TabsMainImpl;
 //# sourceMappingURL=tabs-main.js.map

package/lib/main/browser/tabs/tabs-main.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tabs-main.js","sourceRoot":"","sources":["../../../../src/main/browser/tabs/tabs-main.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAOhF,MAAa,WAAW;IAEpB,YACI,GAAgB,EAChB,SAA+B,IAChC,CAAC;IAEJ,0CAA0C;IAC1C,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,UAAkB,EAAE,aAAuB;QAC9E,OAAO;IACX,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAgB,EAAE,aAAuB;QACrD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAkB,EAAE,aAAuB;QACzD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ;AApBD,kCAoBC"}
1	+ {"version":3,"file":"tabs-main.js","sourceRoot":"","sources":["../../../../src/main/browser/tabs/tabs-main.ts"],"names":[],"mappings":"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"}

package/lib/plugin/tabs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tabs.d.ts","sourceRoot":"","sources":["../../src/plugin/tabs.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAA8B,WAAW,EAAuC,YAAY,EAAE,OAAO,EAAY,MAAM,0BAA0B,CAAC;AAmOzJ,qBAAa,WAAY,YAAW,OAAO;IAc3B,QAAQ,CAAC,GAAG,EAAE,WAAW;IAbrC,SAAiB,aAAa,EAAE,SAAS,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAW;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IACvE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA4C;IAGjF,OAAO,CAAC,aAAa,CAAU;IAE/B,OAAO,CAAC,WAAW,CAAqB;IAExC,OAAO,CAAC,SAAS,CAA8B;gBAE1B,GAAG,EAAE,WAAW;IAIrC,IAAI,SAAS,IAAI,KAAK,CAAC,SAAS,~~CAyC~~/B;IAED,qBAAqB,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI;~~IA4BrD~~,qBAAqB,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI;IAYlD,mBAAmB,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI;IAkClD,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,2BAA2B;YAIrB,UAAU;YAYV,YAAY;CAW7B"}
1	+ {"version":3,"file":"tabs.d.ts","sourceRoot":"","sources":["../../src/plugin/tabs.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAA8B,WAAW,EAAuC,YAAY,EAAE,OAAO,EAAY,MAAM,0BAA0B,CAAC;AAmOzJ,qBAAa,WAAY,YAAW,OAAO;IAc3B,QAAQ,CAAC,GAAG,EAAE,WAAW;IAbrC,SAAiB,aAAa,EAAE,SAAS,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAW;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IACvE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA4C;IAGjF,OAAO,CAAC,aAAa,CAAU;IAE/B,OAAO,CAAC,WAAW,CAAqB;IAExC,OAAO,CAAC,SAAS,CAA8B;gBAE1B,GAAG,EAAE,WAAW;IAIrC,IAAI,SAAS,IAAI,KAAK,CAAC,SAAS,CAiC/B;IAED,qBAAqB,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI;IAgCrD,qBAAqB,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI;IAYlD,mBAAmB,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI;IAkClD,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,2BAA2B;YAIrB,UAAU;YAYV,YAAY;CAW7B"}

package/lib/plugin/tabs.js CHANGED Viewed

@@ -232,14 +232,6 @@ class TabsExtImpl {
                         return this._closeTabs(tabsOrTabGroups, 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);
         }
@@ -253,22 +245,27 @@ class TabsExtImpl {
         const closed = this.tabGroupArr.filter(group => diff.removed.includes(group.groupId)).map(group => group.apiObject);
         const opened = [];
         const changed = [];
+        const tabsOpened = [];
         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 = (0, types_1.assertIsDefined)((_a = tabGroups.find(group => group.isActive === true)) === null || _a === void 0 ? void 0 : _a.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 = (0, types_1.assertIsDefined)((_a = tabGroups.find(group => group.isActive === true)) === null || _a === void 0 ? void 0 : _a.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) {
         const group = this.tabGroupArr.find(tabGroup => tabGroup.groupId === groupDto.groupId);

package/lib/plugin/tabs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tabs.js","sourceRoot":"","sources":["../../src/plugin/tabs.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"tabs.js","sourceRoot":"","sources":["../../src/plugin/tabs.ts"],"names":[],"mappings":"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"}

package/lib/plugin/tree/tree-views.d.ts CHANGED Viewed

@@ -13,7 +13,7 @@ export declare class TreeViewsExtImpl implements TreeViewsExt {
     constructor(rpc: RPCProtocol, commandRegistry: CommandRegistryImpl);
     $dragStarted(treeViewId: string, treeItemIds: string[], token: CancellationToken): Promise<UriComponents[] | undefined>;
     $drop(treeViewId: string, treeItemId: string | undefined, dataTransferItems: [string, string | DataTransferFileDTO][], token: CancellationToken): Promise<void>;
-    protected toTreeItem(treeViewItemRef: TreeViewItemReference): any;
+    protected toTreeElement(treeViewItemRef: TreeViewItemReference): any;
     registerTreeDataProvider<T>(plugin: Plugin, treeViewId: string, treeDataProvider: TreeDataProvider<T>): PluginDisposable;
     createTreeView<T>(plugin: Plugin, treeViewId: string, options: TreeViewOptions<T>): TreeView<T>;
     $getChildren(treeViewId: string, treeItemId: string): Promise<TreeViewItem[] | undefined>;
@@ -30,6 +30,9 @@ declare class TreeViewExtImpl<T> implements Disposable {
     private options;
     private proxy;
     readonly commandsConverter: CommandsConverter;
+    private static readonly ID_COMPUTED;
+    private static readonly ID_ITEM;
+    private nextItemId;
     private readonly onDidExpandElementEmitter;
     readonly onDidExpandElement: import("@theia/core/lib/common/event").Event<TreeViewExpansionEvent<T>>;
     private readonly onDidCollapseElementEmitter;
@@ -54,7 +57,7 @@ declare class TreeViewExtImpl<T> implements Disposable {
     private _description;
     get description(): string;
     set description(description: string);
-    getTreeItem(treeItemId: string): T | undefined;
+    getElement(treeItemId: string): T | undefined;
     /**
      * calculate the chain of node ids from root to element so that the frontend can expand all of them and reveal element.
      * this is needed as the frontend may not have the full tree nodes.
@@ -67,7 +70,7 @@ declare class TreeViewExtImpl<T> implements Disposable {
     private calculateRevealParentChain;
     private getTreeItemLabel;
     private getTreeItemLabelHighlights;
-    private getTreeItemIdLabel;
+    private getItemLabel;
     private buildTreeItemId;
     getChildren(parentId: string): Promise<TreeViewItem[] | undefined>;
     private clearChildren;

package/lib/plugin/tree/tree-views.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tree-views.d.ts","sourceRoot":"","sources":["../../../src/plugin/tree/tree-views.ts"],"names":[],"mappings":"AAkBA,OAAO,EACH,gBAAgB,EAAE,QAAQ,EAAE,sBAAsB,EAClD,4BAA4B,EAAE,6BAA6B,EAAE,iBAAiB,EAAoB,eAAe,EACpH,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAE,UAAU,EAAwB,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAkC,UAAU,IAAI,gBAAgB,EAAa,MAAM,eAAe,CAAC;AAC1G,OAAO,EAAE,MAAM,EAAsB,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAChK,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,qBAAa,gBAAiB,YAAW,YAAY;~~IAMnB~~,QAAQ,CAAC,eAAe,EAAE,mBAAmB;IAJ3E,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2C;gBAEzD,GAAG,EAAE,WAAW,EAAW,eAAe,EAAE,mBAAmB;IAe3E,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IAIvH,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/J,SAAS,CAAC,~~UAAU~~,CAAC,eAAe,EAAE,qBAAqB,GAAG,GAAG;~~IAIjE~~,wBAAwB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB;IASxH,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IAwDzF,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;IAMzF,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAIrH,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIzD,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAUrF,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvE,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxE,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC;CAQlE;AAcD,cAAM,eAAe,CAAC,CAAC,CAAE,YAAW,UAAU;~~IA4BtC~~,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,KAAK;IACb,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;~~IA9BjD~~,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA4C;IACtF,QAAQ,CAAC,kBAAkB,0EAAwC;IAEnE,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAA4C;IACxF,QAAQ,CAAC,oBAAoB,0EAA0C;IAEvE,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAkD;IAC9F,QAAQ,CAAC,oBAAoB,gFAA0C;IAEvE,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAgD;IAC7F,QAAQ,CAAC,qBAAqB,8EAA2C;IAEzE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqC;IAC3D,OAAO,CAAC,cAAc,CAAqB;IAE3C,OAAO,CAAC,iBAAiB,CAAsB;IAE/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAMxB;gBAGU,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,EAC3B,KAAK,EAAE,aAAa,EACnB,iBAAiB,EAAE,iBAAiB;IAYjD,OAAO,IAAI,IAAI;IAIT,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAWjF,OAAO,CAAC,QAAQ,CAAc;IAC9B,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAG1B;IAED,OAAO,CAAC,MAAM,CAAc;IAC5B,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,EAGtB;IAED,OAAO,CAAC,YAAY,CAAc;IAClC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,WAAW,CAAC,WAAW,EAAE,MAAM,EAGlC;IAED,~~WAAW~~,CAAC,UAAU,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;~~IAI9C~~;;;;;;;;OAQG;YACW,0BAA0B;~~IAsCxC~~,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,0BAA0B;IAKlC,OAAO,CAAC,~~kBAAkB~~;~~IAa1B~~,OAAO,CAAC,eAAe;~~IAIjB~~,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;~~IAqFxE~~,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,KAAK;IAUb,OAAO,CAAC,QAAQ;IAKV,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAY5C,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAY7C,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAgBtG,kBAAkB,IAAI,OAAO;IAI7B,OAAO,CAAC,eAAe,CAAqB;IAC5C,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAS1B;IAED,YAAY,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI;IAa7C,SAAS,CAAC,cAAc,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI;IAKzD,OAAO,CAAC,QAAQ,CAAS;IACzB,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO5B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IAmBpG,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAgCzJ"}
1	+ {"version":3,"file":"tree-views.d.ts","sourceRoot":"","sources":["../../../src/plugin/tree/tree-views.ts"],"names":[],"mappings":"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"}

package/lib/plugin/tree/tree-views.js CHANGED Viewed

@@ -33,10 +33,10 @@ class TreeViewsExtImpl {
         commandRegistry.registerArgumentProcessor({
             processArgument: arg => {
                 if (common_1.TreeViewItemReference.is(arg)) {
-                    return this.toTreeItem(arg);
+                    return this.toTreeElement(arg);
                 }
                 else if (Array.isArray(arg)) {
-                    return arg.map(param => common_1.TreeViewItemReference.is(param) ? this.toTreeItem(param) : param);
+                    return arg.map(param => common_1.TreeViewItemReference.is(param) ? this.toTreeElement(param) : param);
                 }
                 else {
                     return arg;
@@ -50,9 +50,9 @@ class TreeViewsExtImpl {
     $drop(treeViewId, treeItemId, dataTransferItems, token) {
         return this.getTreeView(treeViewId).handleDrop(treeItemId, dataTransferItems, token);
     }
-    toTreeItem(treeViewItemRef) {
+    toTreeElement(treeViewItemRef) {
         var _a;
-        return (_a = this.treeViews.get(treeViewItemRef.viewId)) === null || _a === void 0 ? void 0 : _a.getTreeItem(treeViewItemRef.itemId);
+        return (_a = this.treeViews.get(treeViewItemRef.viewId)) === null || _a === void 0 ? void 0 : _a.getElement(treeViewItemRef.itemId);
     }
     registerTreeDataProvider(plugin, treeViewId, treeDataProvider) {
         const treeView = this.createTreeView(plugin, treeViewId, { treeDataProvider });
@@ -211,7 +211,7 @@ class TreeViewExtImpl {
         this._description = description;
         this.proxy.$setDescription(this.treeViewId, this._description);
     }
-    getTreeItem(treeItemId) {
+    getElement(treeItemId) {
         var _a;
         return (_a = this.nodes.get(treeItemId)) === null || _a === void 0 ? void 0 : _a.value;
     }
@@ -250,14 +250,9 @@ class TreeViewExtImpl {
             // 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;
@@ -270,7 +265,7 @@ class TreeViewExtImpl {
         const treeItemLabel = treeItem.label;
         return typeof treeItemLabel === 'object' ? treeItemLabel.highlights : undefined;
     }
-    getTreeItemIdLabel(treeItem) {
+    getItemLabel(treeItem) {
         let idLabel = this.getTreeItemLabel(treeItem);
         // Use resource URI if label is not set
         if (idLabel === undefined && treeItem.resourceUri) {
@@ -282,8 +277,19 @@ class TreeViewExtImpl {
         }
         return idLabel;
     }
-    buildTreeItemId(parentId, index, idLabel) {
-        return `${parentId}/${index}:${idLabel}`;
+    buildTreeItemId(parentId, item) {
+        // 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) {
         const parentNode = this.nodes.get(parentId);
@@ -301,17 +307,16 @@ class TreeViewExtImpl {
         // 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 disposable_1.DisposableCollection();
                 const node = {
                     id,
@@ -391,7 +396,7 @@ class TreeViewExtImpl {
     }
     async onExpanded(treeItemId) {
         // get element from a cache
-        const cachedElement = this.getTreeItem(treeItemId);
+        const cachedElement = this.getElement(treeItemId);
         // fire an event
         if (cachedElement) {
             this.onDidExpandElementEmitter.fire({
@@ -401,7 +406,7 @@ class TreeViewExtImpl {
     }
     async onCollapsed(treeItemId) {
         // get element from a cache
-        const cachedElement = this.getTreeItem(treeItemId);
+        const cachedElement = this.getElement(treeItemId);
         // fire an event
         if (cachedElement) {
             this.onDidCollapseElementEmitter.fire({
@@ -429,7 +434,7 @@ class TreeViewExtImpl {
     get selectedElements() {
         const items = [];
         for (const id of this.selectedItemIds) {
-            const item = this.getTreeItem(id);
+            const item = this.getElement(id);
             if (item) {
                 items.push(item);
             }
@@ -466,7 +471,7 @@ class TreeViewExtImpl {
         var _a, _b;
         const treeItems = [];
         for (const id of treeItemIds) {
-            const item = this.getTreeItem(id);
+            const item = this.getElement(id);
             if (item) {
                 treeItems.push(item);
             }
@@ -483,7 +488,7 @@ class TreeViewExtImpl {
     }
     async handleDrop(treeItemId, dataTransferItems, token) {
         var _a;
-        const treeItem = treeItemId ? this.getTreeItem(treeItemId) : undefined;
+        const treeItem = treeItemId ? this.getElement(treeItemId) : undefined;
         const dropTransfer = new types_impl_1.DataTransfer();
         if ((_a = this.options.dragAndDropController) === null || _a === void 0 ? void 0 : _a.handleDrop) {
             this.localDataTransfer.forEach((item, type) => {
@@ -514,4 +519,6 @@ class TreeViewExtImpl {
         }
     }
 }
+TreeViewExtImpl.ID_COMPUTED = 'c';
+TreeViewExtImpl.ID_ITEM = 'i';
 //# sourceMappingURL=tree-views.js.map