Skip to content

Commit eedb7bd

Browse files
committed
chore: get Qute LS from command context
Signed-off-by: azerr <[email protected]>
1 parent 54f33f5 commit eedb7bd

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

src/main/java/com/redhat/devtools/intellij/qute/psi/core/command/QuteGenerateTemplateAction.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,28 @@
1616
import com.intellij.openapi.fileEditor.FileEditorManager;
1717
import com.intellij.openapi.vfs.VfsUtil;
1818
import com.intellij.openapi.vfs.VirtualFile;
19-
import com.redhat.devtools.lsp4ij.LanguageServiceAccessor;
19+
import com.redhat.devtools.lsp4ij.LanguageServerItem;
20+
import com.redhat.devtools.lsp4ij.commands.CommandExecutor;
2021
import com.redhat.devtools.lsp4ij.commands.LSPCommand;
21-
import org.eclipse.lsp4j.ExecuteCommandOptions;
2222
import org.eclipse.lsp4j.ExecuteCommandParams;
23-
import org.eclipse.lsp4j.services.LanguageServer;
2423
import org.jetbrains.annotations.NotNull;
2524

2625
import java.io.IOException;
2726
import java.net.URI;
2827
import java.net.URISyntaxException;
2928
import java.nio.file.Files;
3029
import java.nio.file.Path;
31-
import java.util.List;
3230

3331
public class QuteGenerateTemplateAction extends QuteAction {
32+
3433
private static final String TEMPLATE_FILE_URI = "templateFileUri";
3534
private static final String QUTE_COMMAND_GENERATE_TEMPLATE_CONTENT = "qute.command.generate.template.content";
36-
private static System.Logger LOGGER = System.getLogger(QuteGenerateTemplateAction.class.getName());
3735

38-
private LanguageServer getFirstServer(AnActionEvent e) {
39-
List<LanguageServer> servers = LanguageServiceAccessor.getInstance(e.getProject()).getActiveLanguageServers(cap -> {
40-
ExecuteCommandOptions provider = cap.getExecuteCommandProvider();
41-
return provider != null && provider.getCommands().contains(QUTE_COMMAND_GENERATE_TEMPLATE_CONTENT);
42-
});
43-
return servers.isEmpty() ? null : servers.get(0);
44-
}
36+
private static System.Logger LOGGER = System.getLogger(QuteGenerateTemplateAction.class.getName());
4537

4638
@Override
4739
protected void commandPerformed(@NotNull LSPCommand command, @NotNull AnActionEvent e) {
48-
LanguageServer server = getFirstServer(e);
40+
LanguageServerItem server = e.getDataContext().getData(CommandExecutor.LSP_COMMAND_LANGUAGE_SERVER);
4941
try {
5042
if (server != null) {
5143
URI uri = getURI(command);
@@ -70,7 +62,7 @@ protected void commandPerformed(@NotNull LSPCommand command, @NotNull AnActionEv
7062
return content;
7163
}).exceptionally(ex -> {
7264
LOGGER.log(System.Logger.Level.WARNING, "Error while generating Qute template", ex);
73-
return ex;
65+
return ex;
7466
});
7567
}
7668
} catch (URISyntaxException ex) {

src/main/java/com/redhat/devtools/intellij/qute/psi/core/command/QuteJavaDefinitionAction.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
import com.redhat.devtools.lsp4ij.LSPIJUtils;
2121
import com.redhat.devtools.lsp4ij.commands.LSPCommand;
2222
import com.redhat.qute.commons.QuteJavaDefinitionParams;
23-
import org.eclipse.lsp4j.Command;
2423
import org.eclipse.lsp4j.Location;
2524
import org.jetbrains.annotations.NotNull;
2625

27-
import java.util.List;
28-
2926
public class QuteJavaDefinitionAction extends QuteAction {
27+
3028
private static final String PROJECT_URI_ATTR = "projectUri";
3129
private static final String SOURCE_TYPE_ATTR = "sourceType";
3230
private static final String SOURCE_FIELD_ATTR = "sourceField";

0 commit comments

Comments
 (0)