Separate java.project.upgradeGradle client and server command (#3014)

* fix duplicate gradle upgrade command
* add advancedUpgradeGradleSupport capability

Signed-off-by: Shi Chen <chenshi@microsoft.com>

Author: CsCherrYY

src/commands.ts

@@ -291,6 +291,11 @@ export namespace Commands {
 
     export const GET_WORKSPACE_PATH = '_java.workspace.path';
 
+    /**
+     * Update the gradle wrapper version for the given project
+     * client-side & server-side commands
+     */
+    export const UPGRADE_GRADLE_WRAPPER_CMD = 'java.project.upgradeGradle.command';
     export const UPGRADE_GRADLE_WRAPPER = 'java.project.upgradeGradle';
 
     export const LOMBOK_CONFIGURE = "java.lombokConfigure";

src/extension.ts

@@ -173,6 +173,7 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 						actionableRuntimeNotificationSupport: true,
 						onCompletionItemSelectedCommand: "editor.action.triggerParameterHints",
 						extractInterfaceSupport: true,
+						advancedUpgradeGradleSupport: true,
 					},
 					triggerFiles,
 				},

src/gradle/gradleCodeActionProvider.ts

@@ -41,7 +41,7 @@ export class GradleCodeActionProvider implements CodeActionProvider<CodeAction>
 					const projectUri = Uri.file(projectPath).toString();
 					const upgradeWrapperCommand: Command = {
 						title: UPGRADE_GRADLE_WRAPPER_TITLE,
-						command: Commands.UPGRADE_GRADLE_WRAPPER,
+						command: Commands.UPGRADE_GRADLE_WRAPPER_CMD,
 						arguments: [projectUri]
 					};
 					const codeAction = new CodeAction(UPGRADE_GRADLE_WRAPPER_TITLE, CodeActionKind.QuickFix.append("gradle"));

src/standardLanguageClient.ts

@@ -571,7 +571,7 @@ export class StandardLanguageClient {
 			}
 		}));
 
-		context.subscriptions.push(commands.registerCommand(Commands.UPGRADE_GRADLE_WRAPPER, (projectUri: string, version?: string) => {
+		context.subscriptions.push(commands.registerCommand(Commands.UPGRADE_GRADLE_WRAPPER_CMD, (projectUri: string, version?: string) => {
 			upgradeGradle(projectUri, version);
 		}));