Duplicate quick fixes when shown at line #1982
Merged
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
|
This is what I'm seeing with this PR.
|
|
test this please |
@rgrunber Could you, please, review it again? |
rgrunber
reviewed
Jan 11, 2022
org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java
Outdated
Show resolved
Hide resolved
|
@rgrunber I have updated the PR. |
rgrunber
reviewed
Jan 12, 2022
org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java
Outdated
Show resolved
Hide resolved
|
test this please |
|
@rgrunber I have updated the PR. |
rgrunber
approved these changes
Jan 14, 2022
|
Just noticed my inline comment never got posted :| One moment. |
rgrunber
reviewed
Jan 14, 2022
Comment on lines
295
to
305
| String[] arguments; | ||
| if (diagnostic.getData() instanceof JsonArray) { | ||
| final JsonArray data = (JsonArray) diagnostic.getData(); | ||
| arguments = new String[data.size()]; | ||
| for (int j = 0; j < arguments.length; j++) { | ||
| arguments[j] = data.get(j).getAsString(); | ||
| } | ||
| } else { | ||
| arguments = new String[0]; | ||
| } | ||
| locations[i] = new ProblemLocationCore(start, end - start, problemId, arguments, isError, IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER); |
There was a problem hiding this comment.
Just the following change for slightly improved readability. It should be the same behaviour.
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 fd60ab29..f46e27be 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
@@ -63,6 +63,7 @@ import org.eclipse.lsp4j.WorkspaceEdit;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
public class CodeActionHandler {
public static final ResponseStore<Either<ChangeCorrectionProposal, CodeActionProposal>> codeActionStore
@@ -292,17 +293,14 @@ public class CodeActionHandler {
int end = DiagnosticsHelper.getEndOffset(unit, diagnostic.getRange());
boolean isError = diagnostic.getSeverity() == DiagnosticSeverity.Error;
int problemId = getProblemId(diagnostic);
- String[] arguments;
+ List<String> arguments = new ArrayList<>();
if (diagnostic.getData() instanceof JsonArray) {
final JsonArray data = (JsonArray) diagnostic.getData();
- arguments = new String[data.size()];
- for (int j = 0; j < arguments.length; j++) {
- arguments[j] = data.get(j).getAsString();
+ for (JsonElement e : data) {
+ arguments.add(e.getAsString());
}
- } else {
- arguments = new String[0];
}
- locations[i] = new ProblemLocationCore(start, end - start, problemId, arguments, isError, IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
+ locations[i] = new ProblemLocationCore(start, end - start, problemId, arguments.toArray(new String[0]), isError, IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
}
return locations;
}Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>
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.
Fixes redhat-developer/vscode-java#2236
Signed-off-by: Snjezana Peco snjezana.peco@redhat.com