update tabs when renaming files

Author: christianalfoni

packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts

@@ -112,6 +112,27 @@ export class ModelsHandler {
     return moduleModel.model;
   };
 
+  public async updateTabsPath(oldPath: string, newPath: string) {
+    const oldModelPath = '/sandbox' + oldPath;
+    const newModelPath = '/sandbox' + newPath;
+
+    return Promise.all(
+      Object.keys(this.moduleModels).map(async path => {
+        if (oldModelPath === path) {
+          const model = await this.moduleModels[path].model;
+
+          // This runs remove/add automatically
+          return this.editorApi.textFileService.move(
+            model.uri,
+            this.monaco.Uri.file(newModelPath)
+          );
+        }
+
+        return Promise.resolve();
+      })
+    );
+  }
+
   public async applyOperation(moduleShortid: string, operation: any) {
     const module = this.sandbox.modules.find(m => m.shortid === moduleShortid);
 

packages/app/src/app/overmind/effects/vscode/index.ts

@@ -267,15 +267,21 @@ export class VSCodeEffect {
     if (this.editorApi) {
       const groupsToClose = this.editorApi.editorService.editorGroupService.getGroups();
 
-      await Promise.all([
-        ...groupsToClose.map(group => group.closeAllEditors()),
-        ...groupsToClose.map(group =>
-          this.editorApi.editorService.editorGroupService.removeGroup(group)
-        ),
-      ]);
+      await Promise.all(
+        groupsToClose.map(group =>
+          Promise.all([
+            group.closeAllEditors(),
+            this.editorApi.editorService.editorGroupService.removeGroup(group),
+          ])
+        )
+      );
     }
   }
 
+  public async updateTabsPath(oldPath: string, newPath: string) {
+    return this.modelsHandler.updateTabsPath(oldPath, newPath);
+  }
+
   public async openModule(module: Module) {
     await this.initialized;
 
@@ -402,9 +408,9 @@ export class VSCodeEffect {
   private async enableExtension(id: string) {
     const extensionEnablementService = await this.extensionEnablementService
       .promise;
-    const extensionIdentifier = (await extensionEnablementService.getDisabledExtensions()).find(
-      ext => ext.id === id
-    );
+    const extensionIdentifier = (
+      await extensionEnablementService.getDisabledExtensions()
+    ).find(ext => ext.id === id);
 
     if (extensionIdentifier) {
       // Sadly we have to call a private api for this. Might change this once we have extension management

packages/app/src/app/overmind/namespaces/files/actions.ts

@@ -44,6 +44,13 @@ export const moduleRenamed: AsyncAction<{
     );
 
     effects.vscode.fs.rename(state.editor.modulesByPath, oldPath, module.path);
+
+    await effects.vscode.updateTabsPath(oldPath, module.path);
+
+    if (state.editor.currentModuleShortid === module.shortid) {
+      effects.vscode.openModule(module);
+    }
+
     actions.editor.internal.updatePreviewCode();
     try {
       await effects.api.saveModuleTitle(sandbox.id, moduleShortid, title);
@@ -54,6 +61,11 @@ export const moduleRenamed: AsyncAction<{
     } catch (error) {
       module.title = oldTitle;
       state.editor.modulesByPath = effects.vscode.fs.create(sandbox);
+
+      if (state.editor.currentModuleShortid === module.shortid) {
+        effects.vscode.openModule(module);
+      }
+
       actions.editor.internal.updatePreviewCode();
       effects.notificationToast.error('Could not rename file');
     }