Tweak eclipse ls packaging/launching

Take advantage of Spring boot properties launcher ability
to add tools.jar to classpath via a system property.
This commit is contained in:
Kris De Volder
2018-03-05 11:01:01 -08:00
parent 0220cf41bd
commit 13d4436254
9 changed files with 78 additions and 104 deletions

View File

@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
org.eclipse.lsp4e;bundle-version="0.5.0",
org.eclipse.lsp4j;bundle-version="0.4.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.4.0",
org.springframework.tooling.ls.eclipse.commons;bundle-version="4.0.0"
org.springframework.tooling.ls.eclipse.commons;bundle-version="4.0.0",
com.google.guava
Import-Package: org.eclipse.jface.preference,
org.osgi.framework
Export-Package: org.springframework.tooling.cloudfoundry.manifest.ls

View File

@@ -31,6 +31,8 @@ import org.osgi.framework.Bundle;
import org.springframework.tooling.ls.eclipse.commons.JRE;
import org.springframework.tooling.ls.eclipse.commons.STS4LanguageServerProcessStreamConnector;
import com.google.common.collect.ImmutableList;
import static org.springframework.tooling.ls.eclipse.commons.console.preferences.LanguageServerConsolePreferenceConstants.*;
/**
@@ -46,23 +48,13 @@ public class CloudFoundryManifestLanguageServer extends STS4LanguageServerProces
public CloudFoundryManifestLanguageServer() {
super(CLOUDFOUNDRY_SERVER);
List<String> commands = new ArrayList<>();
commands.add(JRE.currentJRE().getJavaExecutable());
// commands.add("-Xdebug");
// commands.add("-agentlib:jdwp=transport=dt_socket,address=8899,server=y,suspend=n");
// commands.add("-Dlsp.lazy.completions.disable=true");
commands.add("-Dlsp.completions.indentation.enable=true");
commands.add("-jar");
commands.add(getLanguageServerJARLocation());
String workingDir = getWorkingDirLocation();
setCommands(commands);
setWorkingDirectory(workingDir);
setCommands(JRE.currentJRE().jarLaunchCommand(getLanguageServerJARLocation(), ImmutableList.of(
//"-Xdebug",
//"-agentlib:jdwp=transport=dt_socket,address=8899,server=y,suspend=n",
"-Dlsp.lazy.completions.disable=true",
"-Dlsp.completions.indentation.enable=true"
)));
setWorkingDirectory(getWorkingDirLocation());
}
@Override