diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java index d62767db3..e406f6b08 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java @@ -39,7 +39,7 @@ public class SpringBootJavaLanguageServer extends STS4LanguageServerProcessStrea commands.add("-Dlsp.completions.indentation.enable=true"); commands.add("-Xmx1024m"); commands.add("-cp"); - commands.add(getToolsJAR() + ":" + getLanguageServerJARLocation()); + commands.add(getToolsJAR() + File.pathSeparator + getLanguageServerJARLocation()); commands.add("org.springframework.boot.loader.JarLauncher"); String workingDir = getWorkingDirLocation(); diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.project b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.project index 4540738d4..1f5f63896 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.project +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.project @@ -20,14 +20,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java index f9841bd8d..9b1aaf986 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Main.java @@ -25,7 +25,9 @@ public class Main { public static void main(String[] args) throws IOException, InterruptedException { String serverName = "boot-java-language-server"; - LogRedirect.redirectToFile(serverName); + if (!System.getProperty(LaunguageServerApp.STANDALONE_STARTUP, "false").equals("true")) { + LogRedirect.redirectToFile(serverName); + } LaunguageServerApp.start(serverName, () -> { SimpleLanguageServer server = new BootJavaLanguageServer( BootJavaLanguageServerParams.createDefault() diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java index 7c4f0c50a..eedc19440 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java @@ -58,6 +58,7 @@ import org.springframework.ide.vscode.commons.languageserver.java.ProjectObserve import org.springframework.ide.vscode.commons.languageserver.multiroot.WorkspaceFolder; import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.commons.util.StringUtil; +import org.springframework.ide.vscode.commons.util.UriUtil; import org.springframework.ide.vscode.commons.util.text.LanguageId; import org.springframework.ide.vscode.commons.util.text.TextDocument; @@ -329,7 +330,7 @@ public class SpringIndexer { FileASTRequestor requestor = new FileASTRequestor() { @Override public void acceptAST(String sourceFilePath, CompilationUnit cu) { - String docURI = "file://" + sourceFilePath; + String docURI = UriUtil.toUri(new File(sourceFilePath)).toString(); AtomicReference docRef = new AtomicReference<>(); scanAST(cu, docURI, docRef, null); } diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/.project b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/.project index c5868fa07..6dfad1b9a 100644 --- a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/.project +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/.project @@ -15,11 +15,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.springframework.ide.eclipse.core.springbuilder @@ -30,6 +25,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.springframework.ide.eclipse.core.springnature diff --git a/headless-services/commons/commons-boot-app-cli/pom.xml b/headless-services/commons/commons-boot-app-cli/pom.xml index 9a179faf9..8bc136f53 100644 --- a/headless-services/commons/commons-boot-app-cli/pom.xml +++ b/headless-services/commons/commons-boot-app-cli/pom.xml @@ -35,7 +35,8 @@ tools 1.8.0 system - ${java.home}/../lib/tools.jar + C:\Program Files\Java\jdk1.8.0_144\lib\tools.jar + commons-util diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java index a33705b25..af6840707 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java @@ -56,7 +56,7 @@ import org.springframework.ide.vscode.commons.util.Log; public abstract class LaunguageServerApp { public static final String STS4_LANGUAGESERVER_NAME = "sts4.languageserver.name"; - private static final String STANDALONE_STARTUP = "standalone-startup"; + public static final String STANDALONE_STARTUP = "standalone-startup"; private static final int SERVER_STANDALONE_PORT = 5007; public static void start(String name, Provider languageServerFactory) throws IOException, InterruptedException { diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java index 533ae6bf3..ad214e7c7 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.springframework.ide.vscode.commons.languageserver.util; -import java.nio.file.Path; +import java.net.URI; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collection; @@ -182,13 +182,18 @@ public abstract class SimpleLanguageServer implements Sts4LanguageServer, Langua this.getWorkspaceService().setWorkspaceFolders(workspaceFolders); } else { - String rootPath = params.getRootPath(); - if (rootPath==null) { + String rootUri = params.getRootUri(); + if (rootUri==null) { Log.debug("workspaceRoot NOT SET"); } else { List singleRootFolder = new ArrayList<>(); - Path path = Paths.get(rootPath); - singleRootFolder.add(new WorkspaceFolder(path.toUri().toString(), path.getFileName().toString())); + String name; + try { + name = Paths.get(new URI(rootUri).getPath()).getFileName().toString(); + } catch (Exception e) { + name = ""; + } + singleRootFolder.add(new WorkspaceFolder(rootUri, name)); this.getWorkspaceService().setWorkspaceFolders(singleRootFolder); } } diff --git a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/UriUtil.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/UriUtil.java new file mode 100644 index 000000000..decefec53 --- /dev/null +++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/UriUtil.java @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2016, 2017 Pivotal, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.commons.util; + +import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; + +public class UriUtil { + + public static URI toUri(File file) { + try { + return new URI("file", "", file.getAbsoluteFile().toURI().getPath(), null); //$NON-NLS-1$ //$NON-NLS-2$ + } catch (URISyntaxException e) { + Log.log(e); + return file.getAbsoluteFile().toURI(); + } + } + +}