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

adapt to slightly refactored spring index language server definitions

Browse Source
This commit is contained in:
Martin Lippert
2023-05-10 18:53:54 +02:00
parent a3a83eb70a
commit 1045ec174b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
View File

@@ -622,7 +622,7 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
}
@Override
public void modelUpdated() {
public void indexUpdated() {
}
}

10
eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InProjectSymbolsProvider.java
View File

@@ -27,8 +27,7 @@ import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.eclipse.lsp4j.services.LanguageServer;
import org.springframework.ide.vscode.commons.protocol.spring.Bean;
import org.springframework.ide.vscode.commons.protocol.spring.BeansParams;
import org.springframework.ide.vscode.commons.protocol.spring.SpringModelLanguageServer;
import org.springframework.ide.vscode.commons.protocol.spring.SpringModelService;
import org.springframework.ide.vscode.commons.protocol.spring.SpringIndexLanguageServer;
import org.springframework.tooling.ls.eclipse.gotosymbol.GotoSymbolPlugin;
import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression;
import org.springsource.ide.eclipse.commons.livexp.util.ExceptionUtil;
@@ -134,14 +133,13 @@ public class InProjectSymbolsProvider implements SymbolsProvider {
List<LanguageServer> activeLanguageServers = LanguageServiceAccessor.getActiveLanguageServers(null);
for (LanguageServer languageServer : activeLanguageServers) {
if (languageServer instanceof SpringModelLanguageServer) {
SpringModelLanguageServer springServer = (SpringModelLanguageServer) languageServer;
SpringModelService service = springServer.getSpringModelService();
if (languageServer instanceof SpringIndexLanguageServer) {
SpringIndexLanguageServer springServer = (SpringIndexLanguageServer) languageServer;
BeansParams beansParams = new BeansParams();
beansParams.setProjectName(projectName);
CompletableFuture<List<Bean>> beansFuture = service.beans(beansParams);
CompletableFuture<List<Bean>> beansFuture = springServer.beans(beansParams);
try {
List<Bean> beans = beansFuture.get();