Studio/AndroidIDE
5
0
Fork 0
mirror of https://gitee.com/zhangsken/AndroidIDE.git synced 2026-10-16 07:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: NPE in FindHelper while finding definition of a symbol

Browse Source
This commit is contained in:
Akash Yadav
2023-01-08 12:42:46 +05:30
parent f4b0a4fce4
commit 3a6387a264
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt
+2 -2
View File
@@ -44,7 +44,7 @@ class LocalDefinitionProvider(
val path = trees.getPath(element)
if (path == null) {
log.error("TreePath of element is null. Cannot find definition.", "Element is", element)
emptyList<Location>()
return@get emptyList<Location>()
}
var name = element.simpleName
@@ -52,7 +52,7 @@ class LocalDefinitionProvider(
name = element.enclosingElement.simpleName
}
listOf(FindHelper.location(it, path, name))
return@get listOf(FindHelper.location(it, path, name))
}
}
}
lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java
+7 -5
View File
@@ -128,12 +128,14 @@ public class FindHelper {
}
public static Location location(CompileTask task, TreePath path, CharSequence name) {
LineMap lines = path.getCompilationUnit().getLineMap();
final CompilationUnitTree compilationUnit = path.getCompilationUnit();
final Tree leaf = path.getLeaf();
LineMap lines = compilationUnit.getLineMap();
SourcePositions pos = Trees.instance(task.task).getSourcePositions();
int start = (int) pos.getStartPosition(path.getCompilationUnit(), path.getLeaf());
int end = (int) pos.getEndPosition(path.getCompilationUnit(), path.getLeaf());
int start = (int) pos.getStartPosition(compilationUnit, leaf);
int end = (int) pos.getEndPosition(compilationUnit, leaf);
if (name.length() > 0) {
start = FindHelper.findNameIn(path.getCompilationUnit(), name, start, end);
start = FindHelper.findNameIn(compilationUnit, name, start, end);
end = start + name.length();
}
@@ -144,7 +146,7 @@ public class FindHelper {
int endColumn = (int) lines.getColumnNumber(end);
Position endPos = new Position(endLine - 1, endColumn - 1);
Range range = new Range(startPos, endPos);
URI uri = path.getCompilationUnit().getSourceFile().toUri();
URI uri = compilationUnit.getSourceFile().toUri();
return new Location(Paths.get(uri), range);
}