|
56 | 56 | import org.springframework.ide.vscode.boot.java.requestmapping.RequestMappingHoverProvider; |
57 | 57 | import org.springframework.ide.vscode.boot.java.requestmapping.WebfluxHandlerCodeLensProvider; |
58 | 58 | import org.springframework.ide.vscode.boot.java.requestmapping.WebfluxRouteHighlightProdivder; |
| 59 | +import org.springframework.ide.vscode.boot.java.spel.SpelSemanticTokens; |
59 | 60 | import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache; |
60 | 61 | import org.springframework.ide.vscode.boot.java.utils.SpringLiveChangeDetectionWatchdog; |
61 | 62 | import org.springframework.ide.vscode.boot.java.value.ValueHoverProvider; |
@@ -118,6 +119,7 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent |
118 | 119 | private DocumentSymbolHandler docSymbolProvider; |
119 | 120 | private JdtSemanticTokensHandler semanticTokensHandler; |
120 | 121 | private JdtInlayHintsHandler inlayHintsHandler; |
| 122 | + private SpelSemanticTokens spelSemanticTokens; |
121 | 123 |
|
122 | 124 | public BootJavaLanguageServerComponents(ApplicationContext appContext) { |
123 | 125 | this.server = appContext.getBean(SimpleLanguageServer.class); |
@@ -175,8 +177,10 @@ public BootJavaLanguageServerComponents(ApplicationContext appContext) { |
175 | 177 | projectFinder, |
176 | 178 | Duration.ofSeconds(5), |
177 | 179 | sourceLinks); |
| 180 | + |
| 181 | + spelSemanticTokens = appContext.getBean(SpelSemanticTokens.class); |
178 | 182 |
|
179 | | - codeLensHandler = createCodeLensEngine(springSymbolIndex, projectFinder, server); |
| 183 | + codeLensHandler = createCodeLensEngine(springSymbolIndex, projectFinder, server, spelSemanticTokens); |
180 | 184 |
|
181 | 185 | highlightsEngine = createDocumentHighlightEngine(appContext); |
182 | 186 | documents.onDocumentHighlight(highlightsEngine); |
@@ -312,10 +316,10 @@ protected ReferencesHandler createReferenceHandler(SimpleLanguageServer server, |
312 | 316 | return new BootJavaReferencesHandler(this, cuCache, projectFinder, providers); |
313 | 317 | } |
314 | 318 |
|
315 | | - protected BootJavaCodeLensEngine createCodeLensEngine(SpringSymbolIndex index, JavaProjectFinder projectFinder, SimpleLanguageServer server) { |
| 319 | + protected BootJavaCodeLensEngine createCodeLensEngine(SpringSymbolIndex index, JavaProjectFinder projectFinder, SimpleLanguageServer server, SpelSemanticTokens spelSemanticTokens) { |
316 | 320 | Collection<CodeLensProvider> codeLensProvider = new ArrayList<>(); |
317 | 321 | codeLensProvider.add(new WebfluxHandlerCodeLensProvider(index)); |
318 | | - codeLensProvider.add(new QueryCodeLensProvider(projectFinder, server)); |
| 322 | + codeLensProvider.add(new QueryCodeLensProvider(projectFinder, server, spelSemanticTokens)); |
319 | 323 |
|
320 | 324 | return new BootJavaCodeLensEngine(this, codeLensProvider); |
321 | 325 | } |
|
0 commit comments