diff --git a/headless-services/commons/commons-language-server/.factorypath b/headless-services/commons/commons-language-server/.factorypath index 096a0d0c7..91df0fa4a 100644 --- a/headless-services/commons/commons-language-server/.factorypath +++ b/headless-services/commons/commons-language-server/.factorypath @@ -6,12 +6,12 @@ - - + + - + diff --git a/headless-services/commons/commons-maven/.factorypath b/headless-services/commons/commons-maven/.factorypath index 08a786506..7f8047b58 100644 --- a/headless-services/commons/commons-maven/.factorypath +++ b/headless-services/commons/commons-maven/.factorypath @@ -60,12 +60,12 @@ - - + + - + diff --git a/headless-services/commons/language-server-starter/src/main/java/org/springframework/ide/vscode/languageserver/starter/LanguageServerAutoConf.java b/headless-services/commons/language-server-starter/src/main/java/org/springframework/ide/vscode/languageserver/starter/LanguageServerAutoConf.java index f5449f0d6..5c7df8496 100644 --- a/headless-services/commons/language-server-starter/src/main/java/org/springframework/ide/vscode/languageserver/starter/LanguageServerAutoConf.java +++ b/headless-services/commons/language-server-starter/src/main/java/org/springframework/ide/vscode/languageserver/starter/LanguageServerAutoConf.java @@ -27,8 +27,10 @@ import org.springframework.ide.vscode.commons.languageserver.config.LanguageServ import org.springframework.ide.vscode.commons.languageserver.reconcile.DiagnosticSeverityProvider; import org.springframework.ide.vscode.commons.languageserver.util.DefinitionHandler; import org.springframework.ide.vscode.commons.languageserver.util.LanguageSpecific; +import org.springframework.ide.vscode.commons.languageserver.util.LspClient; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService; +import org.springframework.ide.vscode.commons.languageserver.util.LspClient.Client; import org.springframework.ide.vscode.commons.util.text.LanguageId; import org.springframework.ide.vscode.commons.util.text.TextDocument; import org.springframework.util.Assert; @@ -47,7 +49,10 @@ public class LanguageServerAutoConf { Optional completionFilter ) throws Exception { SimpleLanguageServer server = new SimpleLanguageServer(props.getExtensionId()); - server.setCompletionTriggerCharacters(props.getCompletionTriggerCharacters()); + if (LspClient.currentClient()!=Client.VSCODE) { + //Vscode excluded. See https://github.com/spring-projects/sts4/issues/193 + server.setCompletionTriggerCharacters(props.getCompletionTriggerCharacters()); + } server.setCompletionFilter(completionFilter); severities.ifPresent(server::setDiagnosticSeverityProvider); return server; diff --git a/headless-services/concourse-language-server/.factorypath b/headless-services/concourse-language-server/.factorypath index e0ab7311c..932d1d0fb 100644 --- a/headless-services/concourse-language-server/.factorypath +++ b/headless-services/concourse-language-server/.factorypath @@ -44,12 +44,12 @@ - - + + - + diff --git a/headless-services/spring-boot-language-server/.classpath b/headless-services/spring-boot-language-server/.classpath index 5a94da1a3..cb7220e87 100644 --- a/headless-services/spring-boot-language-server/.classpath +++ b/headless-services/spring-boot-language-server/.classpath @@ -34,16 +34,19 @@ + + + + + + + + + - - - - - - diff --git a/headless-services/spring-boot-language-server/.factorypath b/headless-services/spring-boot-language-server/.factorypath index a2840bb52..b87eb2935 100644 --- a/headless-services/spring-boot-language-server/.factorypath +++ b/headless-services/spring-boot-language-server/.factorypath @@ -70,31 +70,31 @@ - + - - + + - - - - - + + + + + - - + + - + - - + + - +