diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product index dd641ce3f..a487d9e34 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product @@ -82,8 +82,7 @@ openFile - - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product index dd641ce3f..a487d9e34 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product @@ -82,8 +82,7 @@ openFile - - + diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/build.properties b/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/build.properties deleted file mode 100644 index 64f93a9f0..000000000 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/build.properties b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/build.properties deleted file mode 100644 index 3b7db0f69..000000000 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - servers/ diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/plugin.xml deleted file mode 100644 index c4e184d7c..000000000 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/plugin.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/.project b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/.project similarity index 100% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/.project rename to eclipse-language-servers/org.springframework.tooling.boot.ls.feature/.project diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/build.properties b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/build.properties new file mode 100644 index 000000000..4e40d30ef --- /dev/null +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/build.properties @@ -0,0 +1,2 @@ +bin.includes=feature.xml,\ + p2.inf diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml similarity index 81% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml rename to eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml index e344c175a..5c086b3eb 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml @@ -1,6 +1,6 @@ @@ -12,7 +12,7 @@ ../pom.xml - org.springframework.tooling.boot.java.ls.feature + org.springframework.tooling.boot.ls.feature eclipse-feature diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/.classpath b/eclipse-language-servers/org.springframework.tooling.boot.ls/.classpath similarity index 100% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/.classpath rename to eclipse-language-servers/org.springframework.tooling.boot.ls/.classpath diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/.project b/eclipse-language-servers/org.springframework.tooling.boot.ls/.project similarity index 91% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/.project rename to eclipse-language-servers/org.springframework.tooling.boot.ls/.project index 17dc13dae..c2d628371 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/.project +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/.project @@ -1,6 +1,6 @@ - org.springframework.tooling.boot.java.ls + org.springframework.tooling.boot.ls diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/.settings/org.eclipse.jdt.core.prefs b/eclipse-language-servers/org.springframework.tooling.boot.ls/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/.settings/org.eclipse.jdt.core.prefs rename to eclipse-language-servers/org.springframework.tooling.boot.ls/.settings/org.eclipse.jdt.core.prefs diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF similarity index 80% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/META-INF/MANIFEST.MF rename to eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF index 8f5c4b72c..53fee3daf 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Spring Boot Java Language Server +Bundle-Name: Spring Boot Language Server Bundle-Vendor: Pivotal, Inc. -Bundle-SymbolicName: org.springframework.tooling.boot.java.ls;singleton:=true +Bundle-SymbolicName: org.springframework.tooling.boot.ls;singleton:=true Bundle-Version: 0.1.4.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", @@ -22,5 +22,5 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", Import-Package: com.google.gson;version="2.7.0", org.eclipse.jface.preference, org.osgi.framework -Bundle-Activator: org.springframework.tooling.boot.java.ls.BootJavaLanguageServerPlugin +Bundle-Activator: org.springframework.tooling.boot.ls.BootLanguageServerPlugin Bundle-ActivationPolicy: lazy diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/build.properties b/eclipse-language-servers/org.springframework.tooling.boot.ls/build.properties similarity index 100% rename from eclipse-language-servers/org.springframework.tooling.properties.ls/build.properties rename to eclipse-language-servers/org.springframework.tooling.boot.ls/build.properties diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml similarity index 57% rename from eclipse-language-servers/org.springframework.tooling.properties.ls/plugin.xml rename to eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml index 17e3f3e9f..8a21cf74a 100644 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/plugin.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml @@ -2,6 +2,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -73,23 +141,6 @@ scopeName="source.yaml"> - - - - - - - - - + diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml similarity index 89% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/pom.xml rename to eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml index 43078faee..62e9183dc 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml @@ -11,14 +11,14 @@ ../pom.xml - org.springframework.tooling.boot.java.ls + org.springframework.tooling.boot.ls 0.1.4-SNAPSHOT eclipse-plugin org.springframework.ide.vscode - boot-java-language-server + spring-boot-language-server 0.1.4-SNAPSHOT @@ -40,7 +40,7 @@ org.springframework.ide.vscode - boot-java-language-server + spring-boot-language-server true ${project.build.directory}/../servers diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/BootJavaLanguageServerPlugin.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPlugin.java similarity index 88% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/BootJavaLanguageServerPlugin.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPlugin.java index 3425e8079..c46afd755 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/BootJavaLanguageServerPlugin.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017 Pivotal, Inc. + * Copyright (c) 2017, 2018 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 @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; import java.io.IOException; import java.util.ArrayList; @@ -26,16 +26,16 @@ import org.osgi.framework.BundleContext; * @author Alex Boyko * */ -public class BootJavaLanguageServerPlugin extends AbstractUIPlugin { +public class BootLanguageServerPlugin extends AbstractUIPlugin { public static final String ID = "org.springframework.tooling.boot.java.ls"; private static final Object LSP4E_COMMAND_SYMBOL_IN_WORKSPACE = "org.eclipse.lsp4e.symbolinworkspace"; // The shared instance - private static BootJavaLanguageServerPlugin plugin; + private static BootLanguageServerPlugin plugin; - public BootJavaLanguageServerPlugin() { + public BootLanguageServerPlugin() { // Empty } @@ -53,7 +53,7 @@ public class BootJavaLanguageServerPlugin extends AbstractUIPlugin { plugin = null; } - public static BootJavaLanguageServerPlugin getDefault() { + public static BootLanguageServerPlugin getDefault() { return plugin; } diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/BootJavaPreferencesPage.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPreferencesPage.java similarity index 76% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/BootJavaPreferencesPage.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPreferencesPage.java index 0cf63db32..bea662ed7 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/BootJavaPreferencesPage.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/BootLanguageServerPreferencesPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017 Pivotal, Inc. + * Copyright (c) 2017, 2018 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 @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; @@ -21,15 +21,15 @@ import org.eclipse.ui.IWorkbenchPreferencePage; * @author Alex Boyko * */ -public class BootJavaPreferencesPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { +public class BootLanguageServerPreferencesPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - public BootJavaPreferencesPage() { + public BootLanguageServerPreferencesPage() { } @Override public void init(IWorkbench workbench) { setDescription("Settings for Boot-Java language server extension"); - setPreferenceStore(BootJavaLanguageServerPlugin.getDefault().getPreferenceStore()); + setPreferenceStore(BootLanguageServerPlugin.getDefault().getPreferenceStore()); } @Override diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/Constants.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Constants.java similarity index 87% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/Constants.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Constants.java index 29fd33b90..37d086527 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/Constants.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Constants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017 Pivotal, Inc. + * Copyright (c) 2017, 2018 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 @@ -8,14 +8,14 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; /** * @author Martin Lippert */ public class Constants { - public static final String PLUGIN_ID = "org.springframework.tooling.boot.java.ls"; + public static final String PLUGIN_ID = "org.springframework.tooling.boot.ls"; public static final String LANGUAGE_SERVER_VERSION = "0.1.4-SNAPSHOT.jar"; public static final String PREF_BOOT_HINTS = "boot-java.boot-hints.on"; diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java similarity index 88% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java index 077b17a1d..b4821084f 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; import java.io.IOException; import java.io.InputStream; @@ -56,10 +56,10 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi public DelegatingStreamConnectionProvider() { String port = System.getProperty("boot-java-ls-port"); if (port != null) { - this.provider = new SpringBootJavaLanguageServerViaSocket(Integer.parseInt(port)); + this.provider = new SpringBootLanguageServerViaSocket(Integer.parseInt(port)); } else { - this.provider = new SpringBootJavaLanguageServer(); + this.provider = new SpringBootLanguageServer(); } } @@ -95,7 +95,7 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi ResourcesPlugin.getWorkspace().removeResourceChangeListener(fResourceListener); fResourceListener = null; } - BootJavaLanguageServerPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(configListener); + BootLanguageServerPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(configListener); } @Override @@ -108,7 +108,7 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi sendConfiguration(); // Add config listener - BootJavaLanguageServerPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(configListener); + BootLanguageServerPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(configListener); // Add resource listener ResourcesPlugin.getWorkspace().addResourceChangeListener(fResourceListener = new ResourceListener(languageServer, Arrays.asList( @@ -124,7 +124,7 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi Map settings = new HashMap<>(); Map bootJavaObj = new HashMap<>(); Map bootHint = new HashMap<>(); - bootHint.put("on", BootJavaLanguageServerPlugin.getDefault().getPreferenceStore().getBoolean(Constants.PREF_BOOT_HINTS)); + bootHint.put("on", BootLanguageServerPlugin.getDefault().getPreferenceStore().getBoolean(Constants.PREF_BOOT_HINTS)); bootJavaObj.put("boot-hints", bootHint); settings.put("boot-java", bootJavaObj); this.languageServer.getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(settings)); diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/MissingJdkWarning.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/MissingJdkWarning.java similarity index 97% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/MissingJdkWarning.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/MissingJdkWarning.java index 945d97921..c0b45dcb8 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/MissingJdkWarning.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/MissingJdkWarning.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; import java.io.File; diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/PrefsInitializer.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/PrefsInitializer.java similarity index 80% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/PrefsInitializer.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/PrefsInitializer.java index 50115f785..0c4f485fe 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/PrefsInitializer.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/PrefsInitializer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017 Pivotal, Inc. + * Copyright (c) 2017, 2018 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 @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; @@ -25,7 +25,7 @@ public class PrefsInitializer extends AbstractPreferenceInitializer { @Override public void initializeDefaultPreferences() { - BootJavaLanguageServerPlugin.getDefault().getPreferenceStore().setDefault(Constants.PREF_BOOT_HINTS, true); + BootLanguageServerPlugin.getDefault().getPreferenceStore().setDefault(Constants.PREF_BOOT_HINTS, true); } } diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/ResourceListener.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/ResourceListener.java similarity index 97% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/ResourceListener.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/ResourceListener.java index 15649055c..b577284e2 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/ResourceListener.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/ResourceListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017 Pivotal, Inc. + * Copyright (c) 2017, 2018 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 @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; import java.net.URI; import java.nio.file.PathMatcher; 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.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java similarity index 94% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java index 6c1ae5c3b..a4d3f1526 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.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017 Pivotal, Inc. + * Copyright (c) 2017, 2018 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 @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; import static org.springframework.tooling.ls.eclipse.commons.console.preferences.LanguageServerConsolePreferenceConstants.BOOT_JAVA_SERVER; @@ -30,9 +30,9 @@ import org.springframework.tooling.ls.eclipse.commons.STS4LanguageServerProcessS /** * @author Martin Lippert */ -public class SpringBootJavaLanguageServer extends STS4LanguageServerProcessStreamConnector { +public class SpringBootLanguageServer extends STS4LanguageServerProcessStreamConnector { - public SpringBootJavaLanguageServer() { + public SpringBootLanguageServer() { super(BOOT_JAVA_SERVER); List commands = new ArrayList<>(); JRE jre = getJRE(); diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServerViaSocket.java similarity index 88% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServerViaSocket.java index be0b69cef..fce9e66d7 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServerViaSocket.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls; +package org.springframework.tooling.boot.ls; import java.io.IOException; import java.io.InputStream; @@ -17,14 +17,14 @@ import java.net.Socket; import org.eclipse.lsp4e.server.StreamConnectionProvider; -public class SpringBootJavaLanguageServerViaSocket implements StreamConnectionProvider { +public class SpringBootLanguageServerViaSocket implements StreamConnectionProvider { private OutputStream outputStream; private InputStream inputStream; private Socket socket; private int port; - public SpringBootJavaLanguageServerViaSocket(int port) { + public SpringBootLanguageServerViaSocket(int port) { this.port = port; } diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringPropertiesPresentationReconciler.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringPropertiesPresentationReconciler.java similarity index 96% rename from eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringPropertiesPresentationReconciler.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringPropertiesPresentationReconciler.java index db53c505f..4cbe61603 100644 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringPropertiesPresentationReconciler.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringPropertiesPresentationReconciler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016 Pivotal, Inc. + * Copyright (c) 2016, 2018 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 @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.properties.ls; +package org.springframework.tooling.boot.ls; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.propertiesfileeditor.IPropertiesFilePartitions; diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/jdt/SpringBootJavaCompletionProposalComputer.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/jdt/SpringBootJavaCompletionProposalComputer.java similarity index 98% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/jdt/SpringBootJavaCompletionProposalComputer.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/jdt/SpringBootJavaCompletionProposalComputer.java index adac58e61..f6755b230 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/jdt/SpringBootJavaCompletionProposalComputer.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/jdt/SpringBootJavaCompletionProposalComputer.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls.jdt; +package org.springframework.tooling.boot.ls.jdt; import java.util.Arrays; import java.util.Collections; diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/jdt/SpringBootJavaHoverProvider.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/jdt/SpringBootJavaHoverProvider.java similarity index 94% rename from eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/jdt/SpringBootJavaHoverProvider.java rename to eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/jdt/SpringBootJavaHoverProvider.java index 8c0ac05b6..4da525cd6 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/jdt/SpringBootJavaHoverProvider.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/jdt/SpringBootJavaHoverProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017 Pivotal, Inc. + * Copyright (c) 2017, 2018 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 @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.tooling.boot.java.ls.jdt; +package org.springframework.tooling.boot.ls.jdt; import org.eclipse.jdt.ui.text.java.hover.IJavaEditorTextHover; import org.eclipse.jface.text.IInformationControlCreator; diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/syntaxes/YAML.tmLanguage b/eclipse-language-servers/org.springframework.tooling.boot.ls/syntaxes/YAML.tmLanguage similarity index 100% rename from eclipse-language-servers/org.springframework.tooling.properties.ls/syntaxes/YAML.tmLanguage rename to eclipse-language-servers/org.springframework.tooling.boot.ls/syntaxes/YAML.tmLanguage diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/console/preferences/LanguageServerConsolePreferenceConstants.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/console/preferences/LanguageServerConsolePreferenceConstants.java index 117228539..4d7674f53 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/console/preferences/LanguageServerConsolePreferenceConstants.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/console/preferences/LanguageServerConsolePreferenceConstants.java @@ -15,20 +15,17 @@ public class LanguageServerConsolePreferenceConstants { public static final boolean ENABLE_BY_DEFAULT = true; public static final String PREF_BOOT_JAVA_CONSOLE_ENABLED = "boot-java.console.enabled"; - public static final String PREF_BOOT_PROPS_CONSOLE_ENABLED = "boot-properties.console.enabled"; public static final String PREF_CONCOURSE_CONSOLE_ENABLED = "concourse.console.enabled"; public static final String PREF_CLOUDFOUNDRY_CONSOLE_ENABLED = "cloudfoundry.console.enabled"; public static final String PREF_BOSH_CONSOLE_ENABLED = "bosh.console.enabled"; public static final ServerInfo BOOT_JAVA_SERVER = new ServerInfo(PREF_BOOT_JAVA_CONSOLE_ENABLED, "Boot Java"); - public static final ServerInfo BOOT_PROPS_SERVER = new ServerInfo(PREF_BOOT_PROPS_CONSOLE_ENABLED, "Boot Properties"); public static final ServerInfo CLOUDFOUNDRY_SERVER = new ServerInfo(PREF_CLOUDFOUNDRY_CONSOLE_ENABLED, "Cloudfoundry"); public static final ServerInfo CONCOURSE_SERVER = new ServerInfo(PREF_CONCOURSE_CONSOLE_ENABLED, "Concourse"); public static final ServerInfo BOSH_SERVER = new ServerInfo(PREF_BOSH_CONSOLE_ENABLED, "Bosh"); public static final ServerInfo[] ALL_SERVERS = { BOOT_JAVA_SERVER, - BOOT_PROPS_SERVER, CLOUDFOUNDRY_SERVER, CONCOURSE_SERVER, BOSH_SERVER diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml index d52148fa4..8bf9ca993 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml @@ -2,11 +2,7 @@ - - - - - + diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/.project b/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/.project deleted file mode 100644 index 07664547c..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.springframework.tooling.properties.ls.feature - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/build.properties b/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/build.properties deleted file mode 100644 index 64f93a9f0..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/feature.xml deleted file mode 100644 index 568524d00..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/feature.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/pom.xml deleted file mode 100644 index 792def247..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls.feature/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - org.springframework.boot.ide - org.springframework.boot.ide.servers - 4.0.0-SNAPSHOT - ../pom.xml - - - org.springframework.tooling.properties.ls.feature - eclipse-feature - - diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/.classpath b/eclipse-language-servers/org.springframework.tooling.properties.ls/.classpath deleted file mode 100644 index eca7bdba8..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/.project b/eclipse-language-servers/org.springframework.tooling.properties.ls/.project deleted file mode 100644 index f455d5529..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.springframework.tooling.properties.ls - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/.settings/org.eclipse.jdt.core.prefs b/eclipse-language-servers/org.springframework.tooling.properties.ls/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.properties.ls/META-INF/MANIFEST.MF deleted file mode 100644 index 38859cb81..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/META-INF/MANIFEST.MF +++ /dev/null @@ -1,22 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Spring Boot Properties Language Server -Bundle-Vendor: Pivotal, Inc. -Bundle-SymbolicName: org.springframework.tooling.properties.ls;singleton:=true -Bundle-Version: 0.1.4.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", - org.eclipse.core.runtime;bundle-version="3.12.0", - org.eclipse.ui.genericeditor;bundle-version="1.0.0", - org.eclipse.jface.text;bundle-version="3.11.100", - org.eclipse.jdt.ui;bundle-version="3.13.0", - org.eclipse.tm4e.core;bundle-version="0.1.0", - org.eclipse.tm4e.ui;bundle-version="0.1.0", - org.eclipse.lsp4e;bundle-version="0.5.0", - org.eclipse.lsp4j;bundle-version="0.4.0", - org.eclipse.ui.workbench, - org.eclipse.jface, - org.springframework.tooling.ls.eclipse.commons;bundle-version="4.0.0" -Import-Package: com.google.gson;version="2.7.0", - org.eclipse.jface.preference, - org.osgi.framework diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.properties.ls/pom.xml deleted file mode 100644 index 842d37f3a..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - - org.springframework.boot.ide - org.springframework.boot.ide.servers - 4.0.0-SNAPSHOT - ../pom.xml - - - org.springframework.tooling.properties.ls - 0.1.4-SNAPSHOT - eclipse-plugin - - - - org.springframework.ide.vscode - boot-properties-language-server - 0.1.4-SNAPSHOT - - - org.springframework.ide.eclipse - org.json - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - copy - prepare-package - - copy - - - - - org.springframework.ide.vscode - boot-properties-language-server - true - ${project.build.directory}/../servers - - - true - true - - - - - - - - diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/Constants.java b/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/Constants.java deleted file mode 100644 index 4501abaaa..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/Constants.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * 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.tooling.properties.ls; - -/** - * @author Martin Lippert - */ -public class Constants { - - public static final String PLUGIN_ID = "org.springframework.tooling.properties.ls"; - public static final String LANGUAGE_SERVER_VERSION = "0.1.4-SNAPSHOT"; - -} diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringBootPropertiesLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringBootPropertiesLanguageServer.java deleted file mode 100644 index a4c47766e..000000000 --- a/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringBootPropertiesLanguageServer.java +++ /dev/null @@ -1,91 +0,0 @@ -/******************************************************************************* - * 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.tooling.properties.ls; - -import java.io.File; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.StandardCopyOption; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.osgi.framework.Bundle; -import org.springframework.tooling.ls.eclipse.commons.JRE; -import org.springframework.tooling.ls.eclipse.commons.STS4LanguageServerProcessStreamConnector; - -import static org.springframework.tooling.ls.eclipse.commons.console.preferences.LanguageServerConsolePreferenceConstants.*; - -/** - * @author Martin Lippert - */ -public class SpringBootPropertiesLanguageServer extends STS4LanguageServerProcessStreamConnector { - - public SpringBootPropertiesLanguageServer() { - super(BOOT_PROPS_SERVER); - List 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); - } - - protected String getLanguageServerJARLocation() { - String languageServer = "boot-properties-language-server-" + Constants.LANGUAGE_SERVER_VERSION + ".jar"; - - Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID); - File dataFile = bundle.getDataFile(languageServer); - Exception error = null; - try { - copyLanguageServerJAR(languageServer); - } - catch (Exception e) { - error = e; - } - if (!dataFile.exists()) { - File userHome = new File(System.getProperty("user.home")); - File locallyBuiltJar = new File( - userHome, - "git/sts4/headless-services/boot-properties-language-server/target/boot-properties-language-server-"+Constants.LANGUAGE_SERVER_VERSION + ".jar" - ); - if (locallyBuiltJar.exists()) { - return locallyBuiltJar.getAbsolutePath(); - } - if (error!=null) { - error.printStackTrace(); - } - } - - return dataFile.getAbsolutePath(); - } - - protected void copyLanguageServerJAR(String languageServerJarName) throws Exception { - Bundle bundle = Platform.getBundle(Constants.PLUGIN_ID); - InputStream stream = FileLocator.openStream( bundle, new Path("servers/" + languageServerJarName), false ); - - File dataFile = bundle.getDataFile(languageServerJarName); - Files.copy(stream, dataFile.toPath(), StandardCopyOption.REPLACE_EXISTING); - } - -} diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml index 353cbe148..c1dfeb008 100644 --- a/eclipse-language-servers/pom.xml +++ b/eclipse-language-servers/pom.xml @@ -36,12 +36,9 @@ org.springframework.tooling.cloudfoundry.manifest.ls.integration org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature - org.springframework.tooling.properties.ls - org.springframework.tooling.properties.ls.feature - org.springframework.tooling.ls.eclipse.gotosymbol - org.springframework.tooling.boot.java.ls - org.springframework.tooling.boot.java.ls.feature + org.springframework.tooling.boot.ls + org.springframework.tooling.boot.ls.feature org.springframework.tooling.bosh.ls org.springframework.tooling.bosh.ls.feature