Take advantage of CodeActionLiteral client capability #1256
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch? |
|
Done. I just forgot to commit the test. |
|
There are compile error. |
snjeza
reviewed
Nov 9, 2019
...sts/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandlerUseWorkspaceEditTest.java
Outdated
Show resolved
Hide resolved
|
The build errors should be fixed, but I keep getting: whenever I try to build jdt.ls. |
There is still one compiler error: |
I can't reproduce it. |
Fixed, hopefully. |
It is the same. You have to run: before pushing the PR. |
I know I should, but like I mentioned, I had a problem with downloading a |
snjeza
requested review from
fbricon and
snjeza
and removed request for
snjeza
|
It works for me, but someone else must approve. |
testforstephen
requested changes
Nov 11, 2019
If client advertises `CodeActionLiteralSupport`, using that for `java.apply.workspaceEdit` would allow clients to use a generic algorithm, instead of being forced to provide a special case for jdt.ls. Fixes #376 Signed-off-by: Boris Staletic <boris.staletic@gmail.com>
testforstephen
approved these changes
Nov 11, 2019
|
@bstaletic thanks for your contribution, keep 'em coming! |
|
Since the PR was approved by 2 devs, I merged it before actually testing it myself. Big mistake! 1st time I open a file in vscode I get no code actions and see this in the log: I could see that |
fbricon
added a commit
that referenced
this pull request
Nov 13, 2019
This reverts commit 2a2e09b. See #1256 (comment)
|
@fbricon So the If I'm not mistaken, this patch should fix that bug: diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java
index 71e66b8..6521962 100644
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java
+++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java
@@ -187,6 +187,7 @@ public class CodeActionHandler {
}
Command command;
+ boolean commandContainsWorkspaceEdit = false;
if (proposal instanceof CUCorrectionCommandProposal) {
CUCorrectionCommandProposal commandProposal = (CUCorrectionCommandProposal) proposal;
command = new Command(name, commandProposal.getCommand(), commandProposal.getCommandArguments());
@@ -199,12 +200,13 @@ public class CodeActionHandler {
return Optional.empty();
}
command = new Command(name, COMMAND_ID_APPLY_EDIT, Collections.singletonList(edit));
+ commandContainsWorkspaceEdit = true;
}
if (preferenceManager.getClientPreferences().isSupportedCodeActionKind(proposal.getKind())) {
CodeAction codeAction = new CodeAction(name);
codeAction.setKind(proposal.getKind());
- if (preferenceManager.getClientPreferences().isSupportedCodeActionLiteral()) {
+ if (preferenceManager.getClientPreferences().isSupportedCodeActionLiteral() && commandContainsWorkspaceEdit) {
codeAction.setEdit((WorkspaceEdit)command.getArguments().get(0));
} else {
codeAction.setCommand(command);Since it's the quickest thing I could write to see if my assumption is right, would you mind testing this patch before I push it? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If client advertises
CodeActionLiteralSupport, using that forjava.apply.workspaceEditwould allow clients to use a genericalgorithm, instead of being forced to provide a special case for jdt.ls.
Fixes #376
This actually tries to revive #1059. Differences compared to #1059:
isSupportedCodeActionLiteral()instead ofisWorkspaceApplyEditSupported().isSupportedCodeActionLiteral()and I took the chance to fix the docstring from a previous faulty copy/paste.