fix: "Cancel" of generating jar takes no effect (#497)

Author: CsCherrYY

jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java

@@ -155,6 +155,9 @@ public static ExportResult exportJar(List<Object> arguments, IProgressMonitor mo
         if (arguments.size() < 3) {
             return new ExportResult(false, "Invalid export Arguments");
         }
+        if (monitor.isCanceled()) {
+            return new ExportResult(false, "User cancelled");
+        }
         String mainClass = gson.fromJson(gson.toJson(arguments.get(0)), String.class);
         Classpath[] classpaths = gson.fromJson(gson.toJson(arguments.get(1)), Classpath[].class);
         String destination = gson.fromJson(gson.toJson(arguments.get(2)), String.class);
@@ -166,6 +169,9 @@ public static ExportResult exportJar(List<Object> arguments, IProgressMonitor mo
         try (JarOutputStream target = new JarOutputStream(new FileOutputStream(destination), manifest)) {
             Set<String> directories = new HashSet<>();
             for (Classpath classpath : classpaths) {
+                if (monitor.isCanceled()) {
+                    return new ExportResult(false, "User cancelled");
+                }
                 if (classpath.isArtifact) {
                     writeArchive(new ZipFile(classpath.source), /* areDirectoryEntriesIncluded = */true,
                         /* isCompressed = */true, target, directories, monitor);

src/exportJarSteps/GenerateJarExecutor.ts

@@ -82,7 +82,7 @@ export class GenerateJarExecutor implements IExportJarStepExecutor {
                 if (_.isEmpty(classpaths)) {
                     return reject(new Error(ExportJarMessages.CLASSPATHS_EMPTY));
                 }
-                const exportResult: IExportResult | undefined = await Jdtls.exportJar(basename(mainClass), classpaths, destPath);
+                const exportResult: IExportResult | undefined = await Jdtls.exportJar(basename(mainClass), classpaths, destPath, token);
                 if (exportResult?.result === true) {
                     stepMetadata.outputPath = destPath;
                     return resolve(true);

src/java/jdtls.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { commands } from "vscode";
+import { CancellationToken, commands } from "vscode";
 import { Commands, executeJavaLanguageServerCommand } from "../commands";
 import { IExportResult } from "../exportJarSteps/GenerateJarExecutor";
 import { IClasspath } from "../exportJarSteps/IStepMetadata";
@@ -29,9 +29,10 @@ export namespace Jdtls {
         return await commands.executeCommand(Commands.EXECUTE_WORKSPACE_COMMAND, Commands.JAVA_PROJECT_GETMAINCLASSES, params) || [];
     }
 
-    export async function exportJar(mainClass: string, classpaths: IClasspath[], destination: string): Promise<IExportResult | undefined> {
+    export async function exportJar(mainClass: string, classpaths: IClasspath[],
+                                    destination: string, token: CancellationToken): Promise<IExportResult | undefined> {
         return commands.executeCommand(Commands.EXECUTE_WORKSPACE_COMMAND, Commands.JAVA_PROJECT_GENERATEJAR,
-            mainClass, classpaths, destination);
+            mainClass, classpaths, destination, token);
     }
 
     export enum CompileWorkspaceStatus {