Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix disabling JPQL support - properly turn off semantic highlighting

Browse Source
This commit is contained in:
aboyko
2024-06-06 00:16:59 -04:00
parent e0aaff6fa3
commit 72c285eef8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/JdtSemanticTokensHandler.java
View File

@@ -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();
}
}