From 72c285eef8da7b57d20d42c5238bd778e32af7e8 Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 6 Jun 2024 00:16:59 -0400 Subject: [PATCH] Fix disabling JPQL support - properly turn off semantic highlighting --- .../ide/vscode/boot/java/JdtSemanticTokensHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtSemanticTokensHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtSemanticTokensHandler.java index c06a4f624..c2e688a20 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtSemanticTokensHandler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtSemanticTokensHandler.java @@ -54,7 +54,7 @@ public class JdtSemanticTokensHandler implements SemanticTokensHandler { tokenProvidersList.add(tp); } } - this.tokenProviders = tokenProviders; + this.tokenProviders = tokenProvidersList; this.legend = new SemanticTokensLegend( tokenProviders.stream().flatMap(tp -> tp.getTokenTypes().stream()).distinct().collect(Collectors.toList()), tokenProviders.stream().flatMap(tp -> tp.getTokenModifiers().stream()).distinct().collect(Collectors.toList()) @@ -117,7 +117,7 @@ public class JdtSemanticTokensHandler implements SemanticTokensHandler { // If there are tokens computed then also run JDT LS tokens provider not to lose JDT LS semantic highlights cu.accept(jdtLsProvider.getTokensComputer(jp, cu, collector)); } - return collector.get(); + return collector.isEmpty() ? null : collector.get(); } }