From d9e19ae69e2560c71215fb29546cbb09e4717825 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 31 Jan 2019 12:05:53 -0800 Subject: [PATCH] Re-instate trigger chars, but not for vscode See https://github.com/spring-projects/sts4/issues/193 --- .../languageserver/config/LanguageServerProperties.java | 7 +++++-- .../src/main/resources/application.yml | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/config/LanguageServerProperties.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/config/LanguageServerProperties.java index 0d7645f98..8d8e7a804 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/config/LanguageServerProperties.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/config/LanguageServerProperties.java @@ -19,14 +19,17 @@ public class LanguageServerProperties { /** * Extension id is a unique identifier associated with a type of language server. - * It is used to derive furether unique ids that should be 'scoped' to a particular + * It is used to derive further unique ids that should be 'scoped' to a particular * language server. For example ids for vscode comands used to define code actions * are derived by appending command names with this id. */ private String extensionId; /** - * List of characters that trigger completions. + * List of characters that trigger completions. Note: because of this bug: + * https://github.com/spring-projects/sts4/issues/193 this setting is currently + * being ignored when the client is vscode to avoid breaking Java completion + * triggers. */ private String completionTriggerCharacters; diff --git a/headless-services/spring-boot-language-server/src/main/resources/application.yml b/headless-services/spring-boot-language-server/src/main/resources/application.yml index 0caad150f..0e6c8f7e2 100644 --- a/headless-services/spring-boot-language-server/src/main/resources/application.yml +++ b/headless-services/spring-boot-language-server/src/main/resources/application.yml @@ -1,4 +1,3 @@ languageserver: extension-id: vscode-spring-boot -# Disabled trigger-characters for now. See https://github.com/spring-projects/sts4/issues/193 -# completion-trigger-characters: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ. \ No newline at end of file + completion-trigger-characters: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ. \ No newline at end of file