From 766e7193b9bb00bfd81bf2979d79a650bbf8c144 Mon Sep 17 00:00:00 2001 From: Skylot Date: Thu, 1 Apr 2021 19:14:48 +0100 Subject: [PATCH] fix(gui): use correct offset for code line (#1141) --- jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java | 4 ++++ .../src/main/java/jadx/gui/utils/search/TextSearchIndex.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java b/jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java index d22fe3d61..a2258b842 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java @@ -140,6 +140,10 @@ public class StringRef implements CharSequence { return list; } + public int getOffset() { + return offset; + } + public int hashCode() { int h = hash; int len = length; diff --git a/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java b/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java index 307e2bfb8..75b32585a 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java @@ -91,7 +91,7 @@ public class TextSearchIndex { JavaNode node = linesInfo.getJavaNodeByLine(lineNum); JavaNode javaNode = node == null ? cls : node; JNode nodeAtLine = nodeCache.makeFrom(javaNode); - codeIndex.put(new CodeNode(nodeAtLine, line, lineNum, javaNode.getDefPos())); + codeIndex.put(new CodeNode(nodeAtLine, line, lineNum, line.getOffset())); } } catch (Exception e) { LOG.warn("Failed to index class: {}", cls, e);