From 6725770df63e8048bbd1fe79f1ef17dd53781b22 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 5 May 2020 07:35:58 -0700 Subject: [PATCH] Tweak for https://github.com/spring-projects/sts4/issues/427 Allow completion provider to look past a '.' in the completion prefix. --- .../vscode/boot/app/DollarPropertyCompletionProvider.java | 2 +- .../ide/vscode/boot/test/ApplicationYamlEditorTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/DollarPropertyCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/DollarPropertyCompletionProvider.java index 674a9fbc8..82331ee7a 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/DollarPropertyCompletionProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/DollarPropertyCompletionProvider.java @@ -37,7 +37,7 @@ public class DollarPropertyCompletionProvider implements ICompletionEngine, Lang private static PrefixFinder PREFIX_FINDER = new PrefixFinder() { @Override protected boolean isPrefixChar(char c) { - return Character.isJavaIdentifierPart(c) || c=='-'; + return Character.isJavaIdentifierPart(c) || c=='-' || c=='.'; } }; private static final Collection LANGUAGES = ImmutableList.of( diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java index 84d011eab..846014033 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java @@ -137,6 +137,12 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { " service-name: ${<*>}" ); + editor.assertContextualCompletions("spring.appnam<*>", + "spring.application.name<*>", + "spring.data.rest.page-param-name<*>", + "spring.jackson.property-naming-strategy<*>" + ); + editor.assertContextualCompletions("appnam<*>", "spring.application.name<*>", "spring.data.rest.page-param-name<*>",