get rename info query

refs #59

Author: basarat

keymaps/atom-typescript.cson

@@ -7,3 +7,4 @@
   'cmd-b': 'typescript:go-to-declaration'
   'ctrl-;': 'typescript:context-actions'
   'cmd-;': 'typescript:context-actions'
+  'f2': 'typescript:rename-variable'

lib/main/atom/atomUtils.js

@@ -23,3 +23,10 @@ function onDiskAndTs(editor) {
     return false;
 }
 exports.onDiskAndTs = onDiskAndTs;
+function getFilePathPosition() {
+    var editor = atom.workspace.getActiveTextEditor();
+    var filePath = editor.getPath();
+    var position = getEditorPosition(editor);
+    return { filePath: filePath, position: position };
+}
+exports.getFilePathPosition = getFilePathPosition;

lib/main/atom/atomUtils.ts

@@ -30,3 +30,10 @@ export function onDiskAndTs(editor: AtomCore.IEditor) {
     }
     return false;
 }
+
+export function getFilePathPosition(): { filePath: string; position: number } {
+    var editor = atom.workspace.getActiveTextEditor();
+    var filePath = editor.getPath();
+    var position = getEditorPosition(editor);
+    return { filePath, position };
+}

lib/main/atom/commands.js

@@ -83,10 +83,20 @@ function registerCommands() {
     });
     atom.commands.add('atom-text-editor', 'typescript:rename-variable', function (e) {
         atom.notifications.addInfo('coming soon. UI test only');
-        renameView.panelView.renameThis({
-            text: 'someText',
-            onCancel: function () { return console.log('cancel'); },
-            onCommit: function (newText) { return console.log(newText); }
+        parent.getRenameInfo(atomUtils.getFilePathPosition()).then(function (res) {
+            if (!res.canRename) {
+                atom.notifications.addInfo('AtomTS: Rename not available at cursor location');
+                return;
+            }
+            renameView.panelView.renameThis({
+                text: res.displayName,
+                onCancel: function () {
+                    console.log('cancel');
+                },
+                onCommit: function (newText) {
+                    console.log(newText);
+                }
+            });
         });
     });
 }

lib/main/atom/commands.ts

@@ -112,11 +112,30 @@ export function registerCommands() {
     atom.commands.add('atom-text-editor', 'typescript:rename-variable',(e) => {
         // TODO: get text
         atom.notifications.addInfo('coming soon. UI test only');
-        renameView.panelView.renameThis({
-            text: 'someText',
-            onCancel: () => console.log('cancel'),
-            onCommit: (newText) => console.log(newText)
+
+        /*function restoreEditor() {
+            // TODO: if (activePane.isDestroyed()) return;
+
+            var v = atom.views.getView(activeEditor);
+            v.focus();
+        }*/
+        parent.getRenameInfo(atomUtils.getFilePathPosition()).then((res) => {
+            if (!res.canRename) {
+                atom.notifications.addInfo('AtomTS: Rename not available at cursor location');
+                return;
+            }
+            renameView.panelView.renameThis({
+                text: res.displayName,
+                onCancel: () => {
+                    console.log('cancel');
+                },
+                onCommit: (newText) => {
+                    console.log(newText);
+                }
+            });
         });
+
+
     });
 
     /// Register autocomplete commands to show documentations

lib/main/atom/views/renameView.js

@@ -11,6 +11,7 @@ var RenameView = (function (_super) {
     __extends(RenameView, _super);
     function RenameView() {
         _super.apply(this, arguments);
+        this.editorAtRenameStart = null;
     }
     RenameView.prototype.init = function () {
         var _this = this;
@@ -38,11 +39,17 @@ var RenameView = (function (_super) {
         });
     };
     RenameView.prototype.clearView = function () {
+        if (this.editorAtRenameStart && !this.editorAtRenameStart.isDestroyed()) {
+            var view = atom.views.getView(this.editorAtRenameStart);
+            view.focus();
+        }
         panel.hide();
         this.options = {};
+        this.editorAtRenameStart = null;
     };
     RenameView.prototype.renameThis = function (options) {
         this.options = options;
+        this.editorAtRenameStart = atom.workspace.getActiveEditor();
         panel.show();
         this.newNameEditor.model.setText(options.text);
         this.newNameEditor.model.selectAll();

lib/main/atom/views/renameView.ts

@@ -44,14 +44,20 @@ export class RenameView
         });
     }
 
+    public editorAtRenameStart:AtomCore.IEditor = null;
     public clearView() {
+        if(this.editorAtRenameStart && !this.editorAtRenameStart.isDestroyed()){
+            var view = atom.views.getView(this.editorAtRenameStart);
+            view.focus();
+        }
         panel.hide();
         this.options = <any>{};
+        this.editorAtRenameStart = null;
     }
 
     public renameThis(options: RenameViewOptions) {
-
         this.options = options;
+        this.editorAtRenameStart = atom.workspace.getActiveEditor();
         panel.show();
         this.newNameEditor.model.setText(options.text);
         this.newNameEditor.model.selectAll();

lib/main/lang/projectService.js

@@ -183,3 +183,23 @@ function errorsForFile(query) {
     return { errors: diagnostics.map(project.diagnosticToTSError) };
 }
 exports.errorsForFile = errorsForFile;
+function getRenameInfo(query) {
+    var project = getOrCreateProject(query.filePath);
+    var info = project.languageService.getRenameInfo(query.filePath, query.position);
+    if (info && info.canRename) {
+        return {
+            canRename: true,
+            localizedErrorMessage: info.localizedErrorMessage,
+            displayName: info.displayName,
+            fullDisplayName: info.fullDisplayName,
+            kind: info.kind,
+            kindModifiers: info.kindModifiers,
+        };
+    }
+    else {
+        return {
+            canRename: false
+        };
+    }
+}
+exports.getRenameInfo = getRenameInfo;

lib/main/lang/projectService.ts

@@ -309,3 +309,34 @@ export function errorsForFile(query: FilePathQuery): {
 
     return { errors: diagnostics.map(project.diagnosticToTSError) };
 }
+
+export interface GetRenameInfoQuery extends FilePathPositionQuery { }
+export interface GetRenameInfoResponse {
+    canRename: boolean;
+    localizedErrorMessage?: string;
+    displayName?: string;
+    fullDisplayName?: string; // this includes the namespace name
+    kind?: string;
+    kindModifiers?: string;
+    // TODO: add text span information
+}
+export function getRenameInfo(query: GetRenameInfoQuery): GetRenameInfoResponse {
+    var project = getOrCreateProject(query.filePath);
+    var info = project.languageService.getRenameInfo(query.filePath,query.position);
+    if(info && info.canRename){
+        return {
+            canRename: true,
+            localizedErrorMessage: info.localizedErrorMessage,
+            displayName: info.displayName,
+            fullDisplayName: info.fullDisplayName,
+            kind: info.kind,
+            kindModifiers: info.kindModifiers,
+            // TODO: use info.triggerSpan
+        }
+    }
+    else{
+        return {
+            canRename: false
+        }
+    }
+}

lib/typings/atom/atom.d.ts

@@ -540,7 +540,7 @@ declare module AtomCore {
 		subscribeToBuffer():void;
 		subscribeToDisplayBuffer():void;
 		getViewClass():any; // return type are EditorView
-		destroyed():void;
+		isDestroyed():boolean;
 		copy():IEditor;
 		getTitle():string;
 		getLongTitle():string;
@@ -777,6 +777,7 @@ declare module AtomCore {
 		deserializeParams(params:any):any;
 		getViewClass():any; // return type are PaneView
 		isActive():boolean;
+		isDestroyed():boolean;
 		focus():void;
 		blur():void;
 		activate():void;
@@ -890,14 +891,14 @@ declare module AtomCore {
 	interface IWorkspaceStatic {
 		new():IWorkspace;
 	}
-	
+
 	interface IWorkspacePanelOptions{
 		item:any;
 		visible?:boolean;
 		priority?:number;
 	}
-	
-	interface Panel{		
+
+	interface Panel{
 		getItem():any;
 		getPriority():any;
 		isVisible():boolean;
@@ -911,7 +912,7 @@ declare module AtomCore {
 		addRightPanel(options:IWorkspacePanelOptions):Panel;
 		addTopPanel(options:IWorkspacePanelOptions):Panel;
 		addModalPanel(options:IWorkspacePanelOptions):Panel;
-		
+
 		deserializeParams(params:any):any;
 		serializeParams():{paneContainer:any;fullScreen:boolean;};
         eachEditor(callback: Function): void;
@@ -944,7 +945,7 @@ declare module AtomCore {
 		itemOpened(item:any):void;
 		onPaneItemDestroyed(item:any):void;
 		destroyed():void;
-		
+
 		onDidChangeActivePaneItem(item:any):Disposable;
 	}
 

lib/worker/parent.js

@@ -125,3 +125,4 @@ exports.getDefinitionsAtPosition = childQuery(projectService.getDefinitionsAtPos
 exports.updateText = childQuery(projectService.updateText);
 exports.errorsForFile = childQuery(projectService.errorsForFile);
 exports.getSignatureHelps = childQuery(projectService.getSignatureHelps);
+exports.getRenameInfo = childQuery(projectService.getRenameInfo);

lib/worker/parent.ts

@@ -165,3 +165,4 @@ export var getDefinitionsAtPosition = childQuery(projectService.getDefinitionsAt
 export var updateText = childQuery(projectService.updateText);
 export var errorsForFile = childQuery(projectService.errorsForFile);
 export var getSignatureHelps = childQuery(projectService.getSignatureHelps);
+export var getRenameInfo = childQuery(projectService.getRenameInfo);