Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: CodeAction in Java file doesn't work in IDEA EAP 2023-3 EAP #1215

Merged
merged 1 commit into from
Oct 8, 2023
Merged

fix: CodeAction in Java file doesn't work in IDEA EAP 2023-3 EAP #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 62 additions & 64 deletions ...a/com/redhat/devtools/intellij/lsp4ij/operations/diagnostics/LSPDiagnosticsForServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,77 +35,75 @@
*/
public class LSPDiagnosticsForServer {

private final LanguageServerWrapper languageServerWrapper;
private final LanguageServerWrapper languageServerWrapper;

private final boolean codeActionSupported;
private final VirtualFile file;

private final VirtualFile file;
// Map which contains all current diagnostics (as key) and future which load associated quick fixes (as value)
private Map<Diagnostic, LSPLazyCodeActions> diagnostics;

// Map which contains all current diagnostics (as key) and future which load associated quick fixes (as value)
private Map<Diagnostic, LSPLazyCodeActions> diagnostics;
public LSPDiagnosticsForServer(LanguageServerWrapper languageServerWrapper, VirtualFile file) {
this.languageServerWrapper = languageServerWrapper;
this.file = file;
this.diagnostics = Collections.emptyMap();
}

public LSPDiagnosticsForServer(LanguageServerWrapper languageServerWrapper, VirtualFile file) {
this.languageServerWrapper = languageServerWrapper;
this.codeActionSupported = isCodeActionSupported(languageServerWrapper);
this.file = file;
this.diagnostics = Collections.emptyMap();
}
/**
* Update the new LSP published diagnosics.
*
* @param diagnostics the new LSP published diagnosics
*/
public void update(List<Diagnostic> diagnostics) {
// initialize diagnostics map
this.diagnostics = toMap(diagnostics, this.diagnostics);
}

private static boolean isCodeActionSupported(LanguageServerWrapper languageServerWrapper) {
if (!languageServerWrapper.isActive() || languageServerWrapper.isStopping()) {
// This use-case comes from when a diagnostics is published and the language server is stopped
// We cannot use here languageServerWrapper.getServerCapabilities() otherwise it will restart the language server.
return false;
}
ServerCapabilities serverCapabilities = languageServerWrapper.getServerCapabilities();
return serverCapabilities != null && LSPIJUtils.hasCapability(serverCapabilities.getCodeActionProvider());
}
private Map<Diagnostic, LSPLazyCodeActions> toMap(List<Diagnostic> diagnostics, Map<Diagnostic, LSPLazyCodeActions> existingsDiagnostics) {
Map<Diagnostic, LSPLazyCodeActions> map = new HashMap<>(diagnostics.size());
for (Diagnostic diagnostic : diagnostics) {
// Get the existing LSP lazy code actions for the current diagnostic
LSPLazyCodeActions actions = existingsDiagnostics != null ? existingsDiagnostics.get(diagnostic) : null;
if (actions != null) {
// cancel the LSP textDocument/codeAction request if needed
actions.cancel();
}
map.put(diagnostic, new LSPLazyCodeActions(diagnostic, file, languageServerWrapper));
}
return map;
}

/**
* Update the new LSP published diagnosics.
*
* @param diagnostics the new LSP published diagnosics
*/
public void update(List<Diagnostic> diagnostics) {
// initialize diagnostics map
this.diagnostics = toMap(diagnostics, this.diagnostics);
}
/**
* Returns the current diagnostics for the file reported by the language server.
*
* @return the current diagnostics for the file reported by the language server.
*/
public Set<Diagnostic> getDiagnostics() {
return diagnostics.keySet();
}

private Map<Diagnostic, LSPLazyCodeActions> toMap(List<Diagnostic> diagnostics, Map<Diagnostic, LSPLazyCodeActions> existingsDiagnostics) {
Map<Diagnostic, LSPLazyCodeActions> map = new HashMap<>(diagnostics.size());
for (Diagnostic diagnostic : diagnostics) {
// Get the existing LSP lazy code actions for the current diagnostic
LSPLazyCodeActions actions = existingsDiagnostics != null ? existingsDiagnostics.get(diagnostic) : null;
if (actions != null) {
// cancel the LSP textDocument/codeAction request if needed
actions.cancel();
}
map.put(diagnostic, new LSPLazyCodeActions(diagnostic, file, languageServerWrapper));
}
return map;
}
/**
* Returns Intellij quickfixes for the given diagnostic if there available.
*
* @param diagnostic the diagnostic.
* @return Intellij quickfixes for the given diagnostic if there available.
*/
public List<LSPLazyCodeActionIntentionAction> getQuickFixesFor(Diagnostic diagnostic) {
boolean codeActionSupported = isCodeActionSupported(languageServerWrapper);
if (!codeActionSupported || diagnostics.isEmpty()) {
return Collections.emptyList();
}
LSPLazyCodeActions codeActions = diagnostics.get(diagnostic);
return codeActions != null ? codeActions.getCodeActions() : Collections.emptyList();
}

/**
* Returns the current diagnostics for the file reported by the language server.
*
* @return the current diagnostics for the file reported by the language server.
*/
public Set<Diagnostic> getDiagnostics() {
return diagnostics.keySet();
}

/**
* Returns Intellij quickfixes for the given diagnostic if there available.
*
* @param diagnostic the diagnostic.
* @return Intellij quickfixes for the given diagnostic if there available.
*/
public List<LSPLazyCodeActionIntentionAction> getQuickFixesFor(Diagnostic diagnostic) {
if (!codeActionSupported || diagnostics.isEmpty()) {
return Collections.emptyList();
}
LSPLazyCodeActions codeActions = diagnostics.get(diagnostic);
return codeActions != null ? codeActions.getCodeActions() : Collections.emptyList();
}
private static boolean isCodeActionSupported(LanguageServerWrapper languageServerWrapper) {
if (!languageServerWrapper.isActive() || languageServerWrapper.isStopping()) {
// This use-case comes from when a diagnostics is published and the language server is stopped
// We cannot use here languageServerWrapper.getServerCapabilities() otherwise it will restart the language server.
return false;
}
ServerCapabilities serverCapabilities = languageServerWrapper.getServerCapabilities();
return serverCapabilities != null && LSPIJUtils.hasCapability(serverCapabilities.getCodeActionProvider());
}

}
3 changes: 2 additions & 1 deletion src/main/java/com/redhat/devtools/intellij/quarkus/lsp/QuarkusLanguageClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,12 @@ public CompletableFuture<List<CodeAction>> getJavaCodeAction(MicroProfileJavaCod

@Override
public CompletableFuture<CodeAction> resolveCodeAction(CodeAction unresolved) {
var coalesceBy = new CoalesceByKey("microprofile/java/resolveCodeAction");
return runAsBackground("Computing Java resolve code actions", monitor -> {
CodeActionResolveData data = JSONUtility.toModel(unresolved.getData(), CodeActionResolveData.class);
unresolved.setData(data);
return (CodeAction) PropertiesManagerForJava.getInstance().resolveCodeAction(unresolved, PsiUtilsLSImpl.getInstance(getProject()));
});
}, coalesceBy);
}

@Override
Expand Down
Loading