sdedic commented on a change in pull request #3009:
URL: https://github.com/apache/netbeans/pull/3009#discussion_r655907747
##########
File path:
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
##########
@@ -764,139 +758,120 @@ private DocumentSymbol
element2DocumentSymbol(CompilationInfo info, Element el)
if (doc == null) {
return CompletableFuture.completedFuture(Collections.emptyList());
}
- JavaSource js = JavaSource.forDocument(doc);
- if (js == null) {
- return CompletableFuture.completedFuture(Collections.emptyList());
- }
+
+ Range range = params.getRange();
+ int startOffset = Utils.getOffset(doc, range.getStart());
+ int endOffset = Utils.getOffset(doc, range.getEnd());
+
+ ArrayList<Diagnostic> diagnostics = new
ArrayList<>(params.getContext().getDiagnostics());
+ diagnostics.addAll(computeDiags(params.getTextDocument().getUri(),
startOffset, ErrorProvider.Kind.HINTS, documentVersion(doc)));
+
Map<String, org.netbeans.api.lsp.Diagnostic> id2Errors = (Map<String,
org.netbeans.api.lsp.Diagnostic>) doc.getProperty("lsp-errors");
List<Either<Command, CodeAction>> result = new ArrayList<>();
if (id2Errors != null) {
- for (Diagnostic diag : params.getContext().getDiagnostics()) {
- org.netbeans.api.lsp.Diagnostic err =
id2Errors.get(diag.getCode().getLeft());
+ for (Diagnostic diag : diagnostics) {
+ org.netbeans.api.lsp.Diagnostic err =
id2Errors.get(diag.getCode().getLeft());
- if (err == null) {
- client.logMessage(new MessageParams(MessageType.Log, "Cannot
resolve error, code: " + diag.getCode().getLeft()));
- continue;
- }
-
- for (org.netbeans.api.lsp.CodeAction inputAction :
err.getActions().computeCodeActions(ex -> client.logMessage(new
MessageParams(MessageType.Error, ex.getMessage())))) {
- CodeAction action = new CodeAction(inputAction.getTitle());
- action.setDiagnostics(Collections.singletonList(diag));
- action.setKind(CodeActionKind.QuickFix);
- if (inputAction.getCommand() != null) {
- action.setCommand(new
Command(inputAction.getCommand().getTitle(),
inputAction.getCommand().getCommand()));
+ if (err == null) {
+ client.logMessage(new MessageParams(MessageType.Log,
"Cannot resolve error, code: " + diag.getCode().getLeft()));
+ continue;
}
- if (inputAction.getEdit() != null) {
- org.netbeans.api.lsp.WorkspaceEdit edit =
inputAction.getEdit();
- List<Either<TextDocumentEdit, ResourceOperation>>
documentChanges = new ArrayList<>();
- FileObject file = js.getFileObjects().iterator().next();
-
- for (Union2<org.netbeans.api.lsp.TextDocumentEdit,
org.netbeans.api.lsp.ResourceOperation> parts : edit.getDocumentChanges()) {
- if (parts.hasFirst()) {
- List<TextEdit> edits =
parts.first().getEdits().stream().map(te -> new TextEdit(new
Range(Utils.createPosition(file, te.getStartOffset()),
Utils.createPosition(file, te.getEndOffset())),
te.getNewText())).collect(Collectors.toList());
- TextDocumentEdit tde = new TextDocumentEdit(new
VersionedTextDocumentIdentifier(parts.first().getDocument(), -1), edits);
- documentChanges.add(Either.forLeft(tde));
- } else {
- if (parts.second() instanceof
org.netbeans.api.lsp.ResourceOperation.CreateFile) {
- documentChanges.add(Either.forRight(new
CreateFile(((org.netbeans.api.lsp.ResourceOperation.CreateFile)
parts.second()).getNewFile())));
- } else {
- throw new
IllegalStateException(String.valueOf(parts.second()));
+ org.netbeans.api.lsp.Diagnostic.LazyCodeActions actions =
err.getActions();
+ if (actions != null) {
+ for (org.netbeans.api.lsp.CodeAction inputAction :
actions.computeCodeActions(ex -> client.logMessage(new
MessageParams(MessageType.Error, ex.getMessage())))) {
+ CodeAction action = new
CodeAction(inputAction.getTitle());
+ action.setDiagnostics(Collections.singletonList(diag));
+ action.setKind(kind(err.getSeverity()));
+ if (inputAction.getCommand() != null) {
+ action.setCommand(new
Command(inputAction.getCommand().getTitle(),
inputAction.getCommand().getCommand()));
+ }
+ if (inputAction.getEdit() != null) {
+ org.netbeans.api.lsp.WorkspaceEdit edit =
inputAction.getEdit();
+ List<Either<TextDocumentEdit, ResourceOperation>>
documentChanges = new ArrayList<>();
+ for (Union2<org.netbeans.api.lsp.TextDocumentEdit,
org.netbeans.api.lsp.ResourceOperation> parts : edit.getDocumentChanges()) {
+ if (parts.hasFirst()) {
+ String docUri =
parts.first().getDocument();
+ try {
+ FileObject file =
Utils.fromUri(docUri);
+ if (file == null) {
+ file =
Utils.fromUri(params.getTextDocument().getUri());
+ }
+ FileObject fo = file;
+ List<TextEdit> edits =
parts.first().getEdits().stream().map(te -> new TextEdit(new
Range(Utils.createPosition(fo, te.getStartOffset()), Utils.createPosition(fo,
te.getEndOffset())), te.getNewText())).collect(Collectors.toList());
Review comment:
Maybe guard against `fo == null` (unlikely, possible).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
