Enable advanced "Generate getters and setters..." source action

Signed-off-by: Jinbo Wang <[email protected]>

Author: testforstephen

src/commands.ts

@@ -126,4 +126,8 @@ export namespace Commands {
      * Generate toString().
      */
     export const GENERATE_TOSTRING_PROMPT = 'java.action.generateToStringPrompt';
+    /**
+     * Generate Getters and Setters.
+     */
+    export const GENERATE_ACCESSORS_PROMPT = 'java.action.generateAccessorsPrompt';
 }

src/extension.ts

@@ -68,7 +68,8 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 							overrideMethodsPromptSupport: true,
 							hashCodeEqualsPromptSupport: true,
 							advancedOrganizeImportsSupport: true,
-							generateToStringPromptSupport: true
+							generateToStringPromptSupport: true,
+							advancedGenerateAccessorsSupport: true,
 						},
 						triggerFiles: getTriggerFiles()
 					},

src/protocol.ts

@@ -206,3 +206,23 @@ export interface GenerateToStringParams {
 export namespace GenerateToStringRequest {
     export const type = new RequestType<GenerateToStringParams, WorkspaceEdit, void, void>('java/generateToString');
 }
+
+export interface AccessorField {
+    fieldName: string;
+    isStatic: boolean;
+    generateGetter: boolean;
+    generateSetter: boolean;
+}
+
+export namespace ResolveUnimplementedAccessorsRequest {
+    export const type = new RequestType<CodeActionParams, AccessorField[], void, void>('java/resolveUnimplementedAccessors');
+}
+
+export interface GenerateAccessorsParams {
+    context: CodeActionParams;
+    accessors: AccessorField[];
+}
+
+export namespace GenerateAccessorsRequest {
+    export const type = new RequestType<GenerateAccessorsParams, WorkspaceEdit, void, void>('java/generateAccessors');
+}

src/sourceAction.ts

@@ -5,14 +5,15 @@ import { CodeActionParams, LanguageClient } from 'vscode-languageclient';
 import { Commands } from './commands';
 import { applyWorkspaceEdit } from './extension';
 import { ListOverridableMethodsRequest, AddOverridableMethodsRequest, CheckHashCodeEqualsStatusRequest, GenerateHashCodeEqualsRequest,
-OrganizeImportsRequest, ImportCandidate, ImportSelection, GenerateToStringRequest, CheckToStringStatusRequest, VariableField } from './protocol';
+OrganizeImportsRequest, ImportCandidate, ImportSelection, GenerateToStringRequest, CheckToStringStatusRequest, VariableField, ResolveUnimplementedAccessorsRequest, GenerateAccessorsRequest } from './protocol';
 
 export function registerCommands(languageClient: LanguageClient, context: ExtensionContext) {
     registerOverrideMethodsCommand(languageClient, context);
     registerHashCodeEqualsCommand(languageClient, context);
     registerOrganizeImportsCommand(languageClient, context);
     registerChooseImportCommand(context);
     registerGenerateToStringCommand(languageClient, context);
+    registerGenerateAccessorsCommand(languageClient, context);
 }
 
 function registerOverrideMethodsCommand(languageClient: LanguageClient, context: ExtensionContext): void {
@@ -202,3 +203,40 @@ function registerGenerateToStringCommand(languageClient: LanguageClient, context
         applyWorkspaceEdit(workspaceEdit, languageClient);
     }));
 }
+
+function registerGenerateAccessorsCommand(languageClient: LanguageClient, context: ExtensionContext): void {
+    context.subscriptions.push(commands.registerCommand(Commands.GENERATE_ACCESSORS_PROMPT, async (params: CodeActionParams) => {
+        const accessors = await languageClient.sendRequest(ResolveUnimplementedAccessorsRequest.type, params);
+        if (!accessors || !accessors.length) {
+            return;
+        }
+
+        const accessorItems = accessors.map((accessor) => {
+            const description = [];
+            if (accessor.generateGetter) {
+                description.push('getter');
+            }
+            if (accessor.generateSetter) {
+                description.push('setter');
+            }
+            return {
+                label: accessor.fieldName,
+                description: (accessor.isStatic?'static ':'')+ description.join(', '),
+                originalField: accessor,
+            };
+        });
+        const selectedAccessors = await window.showQuickPick(accessorItems, {
+            canPickMany: true,
+            placeHolder:  'Select the fields to generate getters and setters.'
+        });
+        if (!selectedAccessors.length) {
+            return;
+        }
+
+        const workspaceEdit = await languageClient.sendRequest(GenerateAccessorsRequest.type, {
+            context: params,
+            accessors: selectedAccessors.map((item) => item.originalField),
+        });
+        applyWorkspaceEdit(workspaceEdit, languageClient);
+    }));
+}

test/extension.test.ts

@@ -46,7 +46,8 @@ suite('Java Language Extension', () => {
 				Commands.OPEN_JSON_SETTINGS,
 				Commands.ORGANIZE_IMPORTS,
 				Commands.CHOOSE_IMPORTS,
-				Commands.GENERATE_TOSTRING_PROMPT
+				Commands.GENERATE_TOSTRING_PROMPT,
+				Commands.GENERATE_ACCESSORS_PROMPT
 			];
 			const foundJavaCommands = commands.filter(function(value) {
 				return JAVA_COMMANDS.indexOf(value)>=0 || value.startsWith('java.');