From 4b3f3917ad6bb83501447882d45b0dd48890381f Mon Sep 17 00:00:00 2001 From: gayanper Date: Sun, 24 Mar 2019 12:10:33 +0530 Subject: [PATCH] Add support to starting lang server on windows Signed-off-by: gayanper --- .../tools/boot/java/ls/BootJavaPreloadingActivity.scala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/idea-extensions/idea-boot-java/src/org/spring/tools/boot/java/ls/BootJavaPreloadingActivity.scala b/idea-extensions/idea-boot-java/src/org/spring/tools/boot/java/ls/BootJavaPreloadingActivity.scala index 206ecf1b6..0f5c88234 100644 --- a/idea-extensions/idea-boot-java/src/org/spring/tools/boot/java/ls/BootJavaPreloadingActivity.scala +++ b/idea-extensions/idea-boot-java/src/org/spring/tools/boot/java/ls/BootJavaPreloadingActivity.scala @@ -24,7 +24,7 @@ class BootJavaPreloadingActivity extends PreloadingActivity { val javaPath = Paths.get(javaHome) - val javaExec = javaPath.resolve(Paths.get("bin", if(isWindows()) "java.exe" else "java")) + val javaExec = javaPath.resolve(Paths.get("bin", if (isWindows()) "java.exe" else "java")) if (!Files.exists(javaExec)) { // TODO throw error? @@ -38,11 +38,11 @@ class BootJavaPreloadingActivity extends PreloadingActivity { if (javaVersion.startsWith("1.8")) { var toolsJar = javaPath.resolve(Paths.get("lib", "tools.jar")) if (Files.exists(toolsJar)) { - classpath += ":" + toolsJar + classpath += File.pathSeparator + toolsJar } else { toolsJar = javaPath.resolve(Paths.get("..", "lib", "tools.jar")) if (Files.exists(toolsJar)) { - classpath += ":" + toolsJar + classpath += File.pathSeparator + toolsJar } else { // TODO: tools.jar doesn't exist } @@ -53,6 +53,9 @@ class BootJavaPreloadingActivity extends PreloadingActivity { // Error - not Java 8 or 9 } + // wrap class path for spaces in path + classpath = "\'" + classpath + "\'" + LanguageServerDefinition.register( new StsServerDefinition("java", Array( javaExec.toString(),