[WIP] [editor] Renaming a file should rename a corresponding editor

Signed-off-by: Guy Perron <[email protected]>
eclipse-theia · Oct 2, 2017 · 9f174dd · 9f174dd
1 parent 825848e
commit 9f174dd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/packages/core/src/browser/widget-manager.ts b/packages/core/src/browser/widget-manager.ts
@@ -89,6 +89,28 @@ export class WidgetManager {
         return widget as T;
     }
 
+    /*
+     *  check if a widget exists already and rename it
+     */
+    renameWidget(factoryId: string, options: any, newOptions: any, newLabel: any): void {
+        let key = this.toKey({ factoryId, options });
+        let existingWidget = this.widgets.get(key);
+        if (existingWidget) {
+            existingWidget.title.label = newLabel;
+            this.updateWidgetKey(key, existingWidget, factoryId, options, newOptions);
+        }
+    }
+
+    /*
+     *  update a widget key following a rename
+     */
+    private updateWidgetKey(key: any, widget: Widget, factoryId: string, options: any, newOptions: any): void {
+        this.widgets.delete(key);
+        options = newOptions;
+        key = this.toKey({ factoryId, options });
+        this.widgets.set(key, widget);
+    }
+
     /*
      *  returns the construction description for the given widget, or undefined if the widget was not created through this manager.
      */

diff --git a/packages/editor/src/browser/editor-manager.ts b/packages/editor/src/browser/editor-manager.ts
@@ -27,6 +27,9 @@ export interface EditorManager extends OpenHandler {
      * Reject if the given input is not an editor input or an editor cannot be opened.
      */
     open(uri: URI, input?: EditorInput): Promise<EditorWidget>;
+
+    renameWidget(uri: URI, newUri: URI, newLabel: string, input?: EditorInput): void;
+
     /**
      * The most recently focused editor.
      */
@@ -105,6 +108,10 @@ export class EditorManagerImpl implements EditorManager, WidgetFactory {
         });
     }
 
+    renameWidget(uri: URI, newUri: URI, newLabel: string, input?: EditorInput): void {
+        this.widgetManager.renameWidget(this.id, uri.toString(), newUri.toString(), newLabel);
+    }
+
     // don't call directly, but use WidgetManager
     createWidget(uriAsString: string): Promise<Widget> {
         const uri = new URI(uriAsString);

diff --git a/packages/workspace/package.json b/packages/workspace/package.json
@@ -4,6 +4,7 @@
   "description": "Theia - Workspace Extension",
   "dependencies": {
     "@theia/core": "^0.1.1",
+    "@theia/editor": "^0.1.1",
     "@theia/filesystem": "^0.1.1"
   },
   "publishConfig": {

diff --git a/packages/workspace/src/browser/workspace-commands.ts b/packages/workspace/src/browser/workspace-commands.ts
@@ -16,6 +16,7 @@ import { UriSelection } from '@theia/filesystem/lib/common/filesystem-selection'
 import { SingleTextInputDialog, ConfirmDialog } from "@theia/core/lib/browser/dialogs";
 import { OpenerService, OpenHandler, open } from "@theia/core/lib/browser";
 import { WorkspaceServer } from '../common/workspace-protocol';
+import { EditorManager } from "@theia/editor/lib/browser";
 
 export namespace WorkspaceCommands {
     export const NEW_FILE = 'file:newFile';
@@ -61,7 +62,9 @@ export class WorkspaceCommandContribution implements CommandContribution {
         @inject(FileSystem) protected readonly fileSystem: FileSystem,
         @inject(WorkspaceServer) protected readonly workspaceServer: WorkspaceServer,
         @inject(SelectionService) protected readonly selectionService: SelectionService,
-        @inject(OpenerService) protected readonly openerService: OpenerService
+        @inject(OpenerService) protected readonly openerService: OpenerService,
+        @inject(EditorManager) private editorService: EditorManager
+
     ) { }
 
     registerCommands(registry: CommandRegistry): void {
@@ -104,9 +107,11 @@ export class WorkspaceCommandContribution implements CommandContribution {
                     initialValue: uri.path.base,
                     validate: name => this.validateFileName(name, parent)
                 });
-                dialog.open().then(name =>
-                    this.fileSystem.move(uri.toString(), uri.parent.resolve(name).toString())
-                );
+                dialog.open().then(name => {
+                    this.fileSystem.move(uri.toString(), uri.parent.resolve(name).toString()).then(() => {
+                        this.editorService.renameWidget(uri.parent.resolve(uri.path.base), uri.parent.resolve(name), name);
+                    });
+                });
             })
         }));