fixed remaining wrong links to old eclipse-lsp integration and adopted unified language server for boot properties

This commit is contained in:
Martin Lippert
2016-12-01 09:32:59 +01:00
parent 262b26e78c
commit f2f2324d66
5 changed files with 10 additions and 6 deletions

View File

@@ -7,7 +7,7 @@
<requires>
<import plugin="org.eclipse.ui.genericeditor"/>
<import plugin="org.eclipse.languageserver"/>
<import plugin="org.eclipse.lsp4e"/>
</requires>
<plugin

View File

@@ -6,7 +6,7 @@
provider-name="Pivotal, Inc.">
<requires>
<import plugin="org.eclipse.languageserver"/>
<import plugin="org.eclipse.lsp4e"/>
</requires>
<plugin

View File

@@ -6,7 +6,7 @@
provider-name="Pivotal, Inc.">
<requires>
<import plugin="org.eclipse.languageserver"/>
<import plugin="org.eclipse.lsp4e"/>
</requires>
<plugin

View File

@@ -13,6 +13,10 @@
contentType="org.springframework.boot.ide.properties.application.properties"
id="org.eclipse.languageserver.languages.springbootproperties">
</contentTypeMapping>
<contentTypeMapping
contentType="org.springframework.boot.ide.properties.application.yml"
id="org.eclipse.languageserver.languages.springbootproperties">
</contentTypeMapping>
</extension>
</plugin>

View File

@@ -51,7 +51,7 @@ public class SpringBootPropertiesLanguageServer extends ProcessStreamConnectionP
}
protected String getLanguageServerJARLocation() {
String languageServer = "vscode-application-properties-0.0.1-SNAPSHOT.jar";
String languageServer = "vscode-boot-properties-0.0.1-SNAPSHOT.jar";
Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID);
File dataFile = bundle.getDataFile(languageServer);
@@ -74,9 +74,9 @@ public class SpringBootPropertiesLanguageServer extends ProcessStreamConnectionP
protected void copyLanguageServerJAR() throws Exception {
Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID);
InputStream stream = FileLocator.openStream( bundle, new Path("servers/vscode-application-properties-0.0.1-SNAPSHOT.jar"), false );
InputStream stream = FileLocator.openStream( bundle, new Path("servers/vscode-boot-properties-0.0.1-SNAPSHOT.jar"), false );
File dataFile = bundle.getDataFile("vscode-application-properties-0.0.1-SNAPSHOT.jar");
File dataFile = bundle.getDataFile("vscode-boot-properties-0.0.1-SNAPSHOT.jar");
Files.copy(stream, dataFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
}