fixed #12392. Tab indices now updated

after deleting and moving a tab Signed-off-by: Jonah Iden <jonah.iden@typefox.io>
eclipse-theia · Apr 12, 2023 · a98e2df · a98e2df
1 parent 9952221
commit a98e2df
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/packages/plugin-ext/src/main/browser/tabs/tabs-main.ts b/packages/plugin-ext/src/main/browser/tabs/tabs-main.ts
@@ -253,6 +253,7 @@ export class TabsMainImpl implements TabsMain, Disposable {
     private onTabClosed(tabInfo: TabInfo, title: Title<Widget>): void {
         tabInfo.group.tabs.splice(tabInfo.tabIndex, 1);
         this.tabInfoLookup.delete(title);
+        this.updateTabIndices(this.applicationShell.getTabBarFor(title.owner));
         this.proxy.$acceptTabOperation({
             kind: TabModelOperationKind.TAB_CLOSE,
             index: tabInfo.tabIndex,
@@ -267,6 +268,7 @@ export class TabsMainImpl implements TabsMain, Disposable {
         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.updateTabIndices(tabBar);
         this.proxy.$acceptTabOperation({
             kind: TabModelOperationKind.TAB_MOVE,
             index: args.toIndex,
@@ -290,6 +292,17 @@ export class TabsMainImpl implements TabsMain, Disposable {
         return;
     }
 
+    updateTabIndices(tabBar?: TabBar<Widget>): void {
+        if (tabBar) {
+            tabBar.titles.forEach((title, index) => {
+                const tabInfo = this.tabInfoLookup.get(title);
+                if (tabInfo) {
+                    tabInfo.tabIndex = index;
+                }
+            });
+        }
+    }
+
     async $closeTab(tabIds: string[], preserveFocus?: boolean): Promise<boolean> {
         const widgets: Widget[] = [];
         for (const tabId of tabIds) {