From d64d0686f5b5009bb5069fb567c5534227a21ea7 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 10 May 2019 14:59:29 -0400 Subject: [PATCH] Works on Win 10 --- .../springframework/tooling/bosh/ls/BoshLanguageServer.java | 3 ++- .../manifest/ls/CloudFoundryManifestLanguageServer.java | 3 ++- .../tooling/concourse/ls/ConcourseLanguageServer.java | 3 ++- .../commons/STS4LanguageServerProcessStreamConnector.java | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java index 251d8ce2d..a2db47f90 100644 --- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java @@ -31,7 +31,8 @@ public class BoshLanguageServer extends STS4LanguageServerProcessStreamConnector "application.yml", Arrays.asList( "-Dlsp.lazy.completions.disable=true", - "-Dlsp.completions.indentation.enable=true" + "-Dlsp.completions.indentation.enable=true", + "-noverify" ) ); diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java index dba6b46ba..84e906513 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java @@ -45,7 +45,8 @@ public class CloudFoundryManifestLanguageServer extends STS4LanguageServerProces "application.yml", Arrays.asList( "-Dlsp.lazy.completions.disable=true", - "-Dlsp.completions.indentation.enable=true" + "-Dlsp.completions.indentation.enable=true", + "-noverify" ) ); diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java index ccd35290b..4642812a6 100644 --- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java @@ -31,7 +31,8 @@ public class ConcourseLanguageServer extends STS4LanguageServerProcessStreamConn "application.yml", Arrays.asList( "-Dlsp.lazy.completions.disable=true", - "-Dlsp.completions.indentation.enable=true" + "-Dlsp.completions.indentation.enable=true", + "-noverify" ) ); diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java index 02f47d347..421f1bccf 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java @@ -101,7 +101,10 @@ public abstract class STS4LanguageServerProcessStreamConnector extends ProcessSt StringBuilder classpath = new StringBuilder(); classpath.append(languageServerRoot.resolve("BOOT-INF/classes").toFile()); classpath.append(File.pathSeparator); - classpath.append(languageServerRoot.resolve("BOOT-INF/lib/*").toFile()); + classpath.append(languageServerRoot.resolve("BOOT-INF/lib").toFile()); + // Cannot have * in the java.nio.Path on Windows + classpath.append(File.separator); + classpath.append('*'); if (runtime.toolsJar != null) { classpath.append(File.pathSeparator);