Enable move instance method and static member (#1027)

Signed-off-by: Jinbo Wang <jinbwan@microsoft.com>

Author: testforstephen

src/protocol.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-import { RequestType, NotificationType, TextDocumentIdentifier, ExecuteCommandParams, CodeActionParams, WorkspaceEdit, FormattingOptions } from 'vscode-languageclient';
+import { RequestType, NotificationType, TextDocumentIdentifier, ExecuteCommandParams, CodeActionParams, WorkspaceEdit, FormattingOptions, WorkspaceSymbolParams, SymbolInformation } from 'vscode-languageclient';
 import { Command, Range } from 'vscode';
 
 /**
@@ -152,6 +152,7 @@ export interface VariableBinding {
     bindingKey: string;
     name: string;
     type: string;
+    isField: boolean;
 }
 
 export interface CheckHashCodeEqualsResponse {
@@ -320,6 +321,7 @@ export interface MoveParams {
 }
 
 export interface MoveDestinationsResponse {
+    errorMessage?: string;
     destinations: any[];
 }
 
@@ -330,3 +332,13 @@ export namespace GetMoveDestinationsRequest {
 export namespace MoveRequest {
     export const type = new RequestType<MoveParams, RefactorWorkspaceEdit, void, void>('java/move');
 }
+
+export interface SearchSymbolParams extends WorkspaceSymbolParams {
+    projectName: string;
+    maxResults?: number;
+    sourceOnly?: boolean;
+}
+
+export namespace SearchSymbols {
+    export const type = new RequestType<SearchSymbolParams, SymbolInformation[], void, void>('java/searchSymbols');
+}

src/refactorAction.ts

@@ -3,9 +3,9 @@
 import { existsSync } from 'fs';
 import * as path from 'path';
 import { commands, ExtensionContext, Position, TextDocument, Uri, window, workspace } from 'vscode';
-import { FormattingOptions, LanguageClient, WorkspaceEdit, CreateFile, RenameFile, DeleteFile, TextDocumentEdit } from 'vscode-languageclient';
+import { FormattingOptions, LanguageClient, WorkspaceEdit, CreateFile, RenameFile, DeleteFile, TextDocumentEdit, CodeActionParams } from 'vscode-languageclient';
 import { Commands as javaCommands } from './commands';
-import { GetRefactorEditRequest, MoveRequest, RefactorWorkspaceEdit, RenamePosition, GetMoveDestinationsRequest } from './protocol';
+import { GetRefactorEditRequest, MoveRequest, RefactorWorkspaceEdit, RenamePosition, GetMoveDestinationsRequest, SearchSymbols } from './protocol';
 
 export function registerCommands(languageClient: LanguageClient, context: ExtensionContext) {
     registerApplyRefactorCommand(languageClient, context);
@@ -82,6 +82,10 @@ function registerApplyRefactorCommand(languageClient: LanguageClient, context: E
             }
 
             await moveFile(languageClient, [Uri.parse(commandInfo.uri)]);
+        } else if (command === 'moveInstanceMethod') {
+            await moveInstanceMethod(languageClient, params, commandInfo);
+        } else if (command === 'moveStaticMember') {
+            await moveStaticMember(languageClient, params, commandInfo);
         }
     }));
 }
@@ -244,3 +248,101 @@ async function saveEdit(edit: WorkspaceEdit) {
         await document.save();
     }
 }
+
+async function moveInstanceMethod(languageClient: LanguageClient, params: CodeActionParams, commandInfo: any) {
+    const moveDestinations = await languageClient.sendRequest(GetMoveDestinationsRequest.type, {
+        moveKind: 'moveInstanceMethod',
+        sourceUris: [ params.textDocument.uri ],
+        params
+    });
+    if (moveDestinations && moveDestinations.errorMessage) {
+        window.showErrorMessage(moveDestinations.errorMessage);
+        return;
+    }
+
+    if (!moveDestinations || !moveDestinations.destinations || !moveDestinations.destinations.length) {
+        window.showErrorMessage("Cannot find possible class targets to move the selected method to.");
+        return;
+    }
+
+    const destinationNodeItems = moveDestinations.destinations.map((destination) => {
+        return {
+            label: `${destination.type} ${destination.name}`,
+            description: destination.isField ? "Field" : "Method Parameter",
+            destination,
+        };
+    });
+    const methodName = commandInfo && commandInfo.displayName ? commandInfo.displayName : '';
+    const selected = await window.showQuickPick(destinationNodeItems, {
+        placeHolder: `Select the new class for the instance method ${methodName}.`,
+    });
+    if (!selected) {
+        return;
+    }
+
+    const refactorEdit: RefactorWorkspaceEdit = await languageClient.sendRequest(MoveRequest.type, {
+        moveKind: 'moveInstanceMethod',
+        sourceUris: [ params.textDocument.uri ],
+        params,
+        destination: selected.destination,
+    });
+    await applyRefactorEdit(languageClient, refactorEdit);
+}
+
+async function moveStaticMember(languageClient: LanguageClient, params: CodeActionParams, commandInfo: any) {
+    const memberName = commandInfo && commandInfo.displayName ? commandInfo.displayName : '';
+    const exclude: Set<string> = new Set();
+    if (commandInfo.enclosingTypeName) {
+        exclude.add(commandInfo.enclosingTypeName);
+        // 55: Type, 71: Enum, 81: AnnotationType
+        if (commandInfo.memberType === 55 || commandInfo.memeberType === 71
+            || commandInfo.memberType === 81) {
+            exclude.add(`${commandInfo.enclosingTypeName}.${commandInfo.displayName}`);
+        }
+    }
+    const picked = await window.showQuickPick(
+        languageClient.sendRequest(SearchSymbols.type, {
+            query: '*',
+            projectName: commandInfo ? commandInfo.projectName : null,
+            sourceOnly: true,
+        }).then(types => {
+            if (types && types.length) {
+                return types.filter((type) => {
+                    const typeName = type.containerName ? `${type.containerName}.${type.name}` : type.name;
+                    return !exclude.has(typeName);
+                }).sort((a, b) => {
+                    if (a.name < b.name) {
+                        return -1;
+                    } else if (a.name > b.name) {
+                        return 1;
+                    }
+                    return 0;
+                }).map((symbol => {
+                    return {
+                        label: symbol.name,
+                        description: symbol.containerName,
+                        symbolNode: symbol,
+                    };
+                }));
+            } else {
+                return [{
+                    label: 'No result found',
+                    alwaysShow: true,
+                    description: '',
+                    symbolNode: null,
+                }];
+            }
+        }), {
+            placeHolder: `Select the new class for the static member ${memberName}.`
+        });
+
+    if (picked && picked.symbolNode) {
+        const refactorEdit: RefactorWorkspaceEdit = await languageClient.sendRequest(MoveRequest.type, {
+            moveKind: 'moveStaticMember',
+            sourceUris: [ params.textDocument.uri ],
+            params,
+            destination: picked.symbolNode,
+        });
+        await applyRefactorEdit(languageClient, refactorEdit);
+    }
+}