Fix: classpath is not generated into argfile when using shortCommanLine=argfile (microsoft#384)

testforstephen · web-flow · commit 64b54e8c781e · 2021-09-13T15:30:35.000+08:00
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchUtils.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchUtils.java
@@ -73,11 +73,11 @@ public static synchronized Path generateClasspathJar(String[] classPaths) throws
     public static synchronized Path generateArgfile(String[] classPaths, String[] modulePaths) throws IOException {
         String argfile = "";
         if (ArrayUtils.isNotEmpty(classPaths)) {
-            argfile = "-classpath \"" + String.join(File.pathSeparator, classPaths) + "\"";
+            argfile = "-cp \"" + String.join(File.pathSeparator, classPaths) + "\"";
         }
 
         if (ArrayUtils.isNotEmpty(modulePaths)) {
-            argfile = " --module-path \"" + String.join(File.pathSeparator, modulePaths) + "\"";
+            argfile += " --module-path \"" + String.join(File.pathSeparator, modulePaths) + "\"";
         }
 
         argfile = argfile.replace("\\", "\\\\");

Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@ public static synchronized Path generateClasspathJar(String[] classPaths) throws`
`73`	`73`	`public static synchronized Path generateArgfile(String[] classPaths, String[] modulePaths) throws IOException {`
`74`	`74`	`String argfile = "";`
`75`	`75`	`if (ArrayUtils.isNotEmpty(classPaths)) {`
`76`		`- argfile = "-classpath \"" + String.join(File.pathSeparator, classPaths) + "\"";`
	`76`	`+ argfile = "-cp \"" + String.join(File.pathSeparator, classPaths) + "\"";`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if (ArrayUtils.isNotEmpty(modulePaths)) {`
`80`		`- argfile = " --module-path \"" + String.join(File.pathSeparator, modulePaths) + "\"";`
	`80`	`+ argfile += " --module-path \"" + String.join(File.pathSeparator, modulePaths) + "\"";`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`argfile = argfile.replace("\\", "\\\\");`