Skip to content

getStartPosition and getEndPosition can return Diagnostic.NOPOS. #348

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

Open
brown wants to merge 1 commit into
base: master
Choose a base branch
from
Open

getStartPosition and getEndPosition can return Diagnostic.NOPOS. #348

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
13 changes: 9 additions & 4 deletions src/main/java/org/javacs/markup/ErrorProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private List<org.javacs.lsp.Diagnostic> compilerErrors(CompilationUnitTree root)
var result = new ArrayList<org.javacs.lsp.Diagnostic>();
for (var d : task.diagnostics) {
if (d.getSource() == null || !d.getSource().toUri().equals(root.getSourceFile().toUri())) continue;
if (d.getStartPosition() == -1 || d.getEndPosition() == -1) continue;
if (d.getStartPosition() == Diagnostic.NOPOS || d.getEndPosition() == Diagnostic.NOPOS) continue;
result.add(lspDiagnostic(d, root.getLineMap()));
}
return result;
Expand Down Expand Up @@ -126,19 +126,24 @@ private org.javacs.lsp.Diagnostic warnUnused(Element unusedEl) {
throw new RuntimeException(unusedEl + " has no path");
}
var root = path.getCompilationUnit();
var file = Paths.get(root.getSourceFile().toUri());
var contents = FileStore.contents(file);
var leaf = path.getLeaf();
var pos = trees.getSourcePositions();
var start = (int) pos.getStartPosition(root, leaf);
var end = (int) pos.getEndPosition(root, leaf);
if (end == Diagnostic.NOPOS) {
end = contents.length();
}

if (leaf instanceof VariableTree) {
var v = (VariableTree) leaf;
var offset = (int) pos.getEndPosition(root, v.getType());
if (offset != -1) {
if (offset != Diagnostic.NOPOS) {
start = offset;
}
}
var file = Paths.get(root.getSourceFile().toUri());
var contents = FileStore.contents(file);

var name = unusedEl.getSimpleName();
if (name.contentEquals("<init>")) {
name = unusedEl.getEnclosingElement().getSimpleName();
Expand Down
Loading