From c03a5474ce913cbf62dbd0ea2a49fb859b1bd258 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 15 Feb 2018 10:51:12 -0800 Subject: [PATCH] Re-unite WORKSPACE_CAPABILITY_ID and WORKSPACE_CAPABILITY_NAME Seems odd to separate these into two different locations. --- .../boot/java/BootJavaLanguageServerComponents.java | 7 ------- .../.settings/org.eclipse.jdt.ui.prefs | 2 +- .../commons/languageserver/util/SimpleLanguageServer.java | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java index b6b917665..e0ff1e0db 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java @@ -77,10 +77,6 @@ import com.google.common.collect.ImmutableList; */ public class BootJavaLanguageServerComponents implements LanguageServerComponents { - public static final String WORKSPACE_FOLDERS_CAPABILITY_NAME = "workspace/didChangeWorkspaceFolders"; - public static final String WORKSPACE_FOLDERS_CAPABILITY_ID = UUID.randomUUID().toString(); - - private final SimpleLanguageServer server; private final BootLanguageServerParams serverParams; private final SpringIndexer indexer; @@ -176,9 +172,6 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent } private void initialized() { - Registration registration = new Registration(WORKSPACE_FOLDERS_CAPABILITY_ID, WORKSPACE_FOLDERS_CAPABILITY_NAME, null); - RegistrationParams registrationParams = new RegistrationParams(Collections.singletonList(registration)); - server.getClient().registerCapability(registrationParams); this.indexer.serverInitialized(); // TODO: due to a missing message from lsp4e this "initialized" is not called in // the LSP4E case diff --git a/headless-services/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs b/headless-services/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs index 75f829439..68f26e829 100644 --- a/headless-services/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs +++ b/headless-services/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs @@ -27,7 +27,7 @@ sp_cleanup.make_variable_declarations_final=false sp_cleanup.never_use_blocks=false sp_cleanup.never_use_parentheses_in_expressions=true sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true +sp_cleanup.organize_imports=false sp_cleanup.qualify_static_field_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true 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 a4c70734a..777b11af8 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 @@ -14,6 +14,7 @@ import java.net.URI; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -35,6 +36,8 @@ import org.eclipse.lsp4j.InitializeResult; import org.eclipse.lsp4j.MessageParams; import org.eclipse.lsp4j.MessageType; import org.eclipse.lsp4j.Range; +import org.eclipse.lsp4j.Registration; +import org.eclipse.lsp4j.RegistrationParams; import org.eclipse.lsp4j.ServerCapabilities; import org.eclipse.lsp4j.TextDocumentIdentifier; import org.eclipse.lsp4j.TextDocumentSyncKind; @@ -81,6 +84,8 @@ import reactor.core.scheduler.Schedulers; public class SimpleLanguageServer implements Sts4LanguageServer, LanguageClientAware, ServiceNotificationsClient, SimpleLanguageServerWrapper { private static final String WORKSPACE_FOLDERS_CAPABILITY_ID = UUID.randomUUID().toString(); + public static final String WORKSPACE_FOLDERS_CAPABILITY_NAME = "workspace/didChangeWorkspaceFolders"; + private static final Scheduler RECONCILER_SCHEDULER = Schedulers.newSingle("Reconciler"); public final String EXTENSION_ID; @@ -233,6 +238,9 @@ public class SimpleLanguageServer implements Sts4LanguageServer, LanguageClientA @Override public void initialized() { + Registration registration = new Registration(WORKSPACE_FOLDERS_CAPABILITY_ID, WORKSPACE_FOLDERS_CAPABILITY_NAME, null); + RegistrationParams registrationParams = new RegistrationParams(Collections.singletonList(registration)); + getClient().registerCapability(registrationParams); Runnable h = this.initializedHandler; if (h!=null) { h.run();