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

Move "sts/show/document" into boot ls

Browse Source
This commit is contained in:
aboyko
2023-03-14 15:15:27 -04:00
parent af2881318d
commit c85ee8202b
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
View File

@@ -345,16 +345,6 @@ public final class SimpleLanguageServer implements Sts4LanguageServer, LanguageC
getWorkspaceService().onExecuteCommand(this::executeCommand);
}
onCommand("sts/show/document", p -> {
ShowDocumentParams showDocParams = new Gson().fromJson((JsonElement)p.getArguments().get(0), ShowDocumentParams.class);
return getClient().showDocument(showDocParams).thenApply(r -> {
if (!r.isSuccess()) {
MessageParams messageParams = new MessageParams(MessageType.Error, "Failed to open: " + showDocParams.getUri());
getClient().showMessage(messageParams);
}
return null;
});
});
ServerCapabilities cap = getServerCapabilities();
if (appContext!=null) {
Map<String, ServerCapabilityInitializer> extraCaps = appContext.getBeansOfType(ServerCapabilityInitializer.class);

19
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java
View File

@@ -13,6 +13,9 @@ package org.springframework.ide.vscode.boot.app;
import java.util.Collections;
import java.util.List;
import org.eclipse.lsp4j.MessageParams;
import org.eclipse.lsp4j.MessageType;
import org.eclipse.lsp4j.ShowDocumentParams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -48,6 +51,9 @@ import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvid
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
@Component
public class BootLanguageServerInitializer implements InitializingBean {
@@ -158,7 +164,18 @@ public class BootLanguageServerInitializer implements InitializingBean {
// reconcile();
}
// });
server.onCommand("sts/show/document", p -> {
ShowDocumentParams showDocParams = new Gson().fromJson((JsonElement)p.getArguments().get(0), ShowDocumentParams.class);
return server.getClient().showDocument(showDocParams).thenApply(r -> {
if (!r.isSuccess()) {
MessageParams messageParams = new MessageParams(MessageType.Error, "Failed to open: " + showDocParams.getUri());
server.getClient().showMessage(messageParams);
}
return null;
});
});
server.onShutdown(() -> {
for (TextDocument d : documents.getAll()) {
documents.publishDiagnostics(d.getId(), Collections.emptyList());