From 42e581555a5d04d59065753a57ba19b67094eb03 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 22 May 2019 11:27:26 -0700 Subject: [PATCH] Small tweak to CompletionServerCapabilityRegistration Don't set trigger characters if none are configured for a given language. --- .../util/CompletionServerCapabilityRegistration.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionServerCapabilityRegistration.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionServerCapabilityRegistration.java index 223167077..e254b1045 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionServerCapabilityRegistration.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionServerCapabilityRegistration.java @@ -90,7 +90,7 @@ public class CompletionServerCapabilityRegistration implements ServerCapabilityI RegistrationParams regParams = new RegistrationParams(registrations); log.info("Registering Dynamic Completion Capabality {}", regParams); return Mono.fromFuture(server.getClient().registerCapability(regParams)); - })); + })).toFuture(); } } @@ -99,7 +99,11 @@ public class CompletionServerCapabilityRegistration implements ServerCapabilityI for (int i = 0; i < triggerCharsString.length(); i++) { builder.add(triggerCharsString.substring(i, i+1)); } - return builder.build(); + ImmutableList list = builder.build(); + if (list.isEmpty()) { + return null; + } + return list; } }