added static methods to set additional init options

This commit is contained in:
Martin Lippert
2017-06-12 14:23:44 +02:00
parent 64647f6079
commit 7c4e751da4
4 changed files with 33 additions and 5 deletions

View File

@@ -8,6 +8,8 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.lsp4e;bundle-version="0.2.0"
Import-Package: org.eclipse.jface.preference,
org.eclipse.lsp4j;version="0.2.0.v20170518-0647",
org.eclipse.lsp4j.jsonrpc.messages;version="0.1.0.v20170117-0759",
org.eclipse.lsp4j.services;version="0.1.0.v20170117-0759",
org.osgi.framework
Export-Package: org.springframework.tooling.cloudfoundry.manifest.ls

View File

@@ -5,7 +5,7 @@
<extension
point="org.eclipse.lsp4e.languageServer">
<server
class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryManifestLanguageServer"
class="org.springframework.tooling.cloudfoundry.manifest.ls.CloudFoundryManifestLanguageServer"
id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
label="Cloud Foundry Manifest Language Server">
</server>
@@ -18,7 +18,7 @@
<extension
point="org.eclipse.lsp4e.languageServer">
<server
class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryManifestLanguageServer"
class="org.springframework.tooling.cloudfoundry.manifest.ls.CloudFoundryManifestLanguageServer"
id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
label="Cloud Foundry Manifest Language Server">
</server>

View File

@@ -8,10 +8,11 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.boot.ide.cloudfoundry.server;
package org.springframework.tooling.cloudfoundry.manifest.ls;
import java.io.File;
import java.io.InputStream;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
@@ -24,7 +25,10 @@ import org.eclipse.jdt.internal.launching.StandardVMType;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.lsp4e.server.ProcessStreamConnectionProvider;
import org.eclipse.lsp4j.DidChangeConfigurationParams;
import org.eclipse.lsp4j.InitializeResult;
import org.eclipse.lsp4j.jsonrpc.messages.Message;
import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage;
import org.eclipse.lsp4j.services.LanguageServer;
import org.osgi.framework.Bundle;
@@ -33,6 +37,12 @@ import org.osgi.framework.Bundle;
*/
@SuppressWarnings("restriction")
public class CloudFoundryManifestLanguageServer extends ProcessStreamConnectionProvider {
private static Object cfTargetOptionSettings;
public static void setCfTargetLoginOptions(Object cfTargetOptions) {
cfTargetOptionSettings = cfTargetOptions;
}
public CloudFoundryManifestLanguageServer() {
List<String> commands = new ArrayList<>();
@@ -49,7 +59,23 @@ public class CloudFoundryManifestLanguageServer extends ProcessStreamConnectionP
setWorkingDirectory(workingDir);
}
public void handleMessage(Message message, LanguageServer languageServer, String rootPath) {
@Override
public void handleMessage(Message message, LanguageServer languageServer, URI rootPath) {
if (message instanceof ResponseMessage) {
ResponseMessage responseMessage = (ResponseMessage)message;
if (responseMessage.getResult() instanceof InitializeResult) {
System.out.println("LS INITIALIZED !!!!!!");
// enable validation: so far, no better way found than changing conf after init.
DidChangeConfigurationParams params = new DidChangeConfigurationParams(getInitializationOptions(rootPath));
languageServer.getWorkspaceService().didChangeConfiguration(params);
}
}
}
@Override
public Object getInitializationOptions(URI rootUri) {
return cfTargetOptionSettings;
}
protected String getJDKLocation() {

View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.boot.ide.cloudfoundry.server;
package org.springframework.tooling.cloudfoundry.manifest.ls;
/**
* @author Martin Lippert