fix: Misleading behavior after cancelling exporting jar (#511)

microsoft · May 26, 2021 · 90cc9aa · 90cc9aa
1 parent 176c31c
commit 90cc9aa
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java b/jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java
@@ -40,6 +40,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
@@ -147,6 +148,19 @@ public static boolean exportJar(List<Object> arguments, IProgressMonitor monitor
         Classpath[] classpaths = gson.fromJson(gson.toJson(arguments.get(1)), Classpath[].class);
         String destination = gson.fromJson(gson.toJson(arguments.get(2)), String.class);
         String terminalId = gson.fromJson(gson.toJson(arguments.get(3)), String.class);
+        try {
+            return exportJarExecution(mainClass, classpaths, destination, terminalId, monitor);
+        } catch (OperationCanceledException e) {
+            File jarFile = new File(destination);
+            if (jarFile.exists()) {
+                jarFile.delete();
+            }
+        }
+        return false;
+    }
+
+    private static boolean exportJarExecution(String mainClass, Classpath[] classpaths, String destination,
+            String terminalId, IProgressMonitor monitor) throws OperationCanceledException {
         Manifest manifest = new Manifest();
         manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
         if (mainClass.length() > 0) {