fix(gui): don't highlight whitespaces and special symbols (#1429)

skylot · Mar 28, 2022 · e4f4c1b · e4f4c1b
1 parent e5fa818
commit e4f4c1b
Showing 1 changed file with 29 additions and 4 deletions.
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
@@ -25,6 +25,7 @@
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.Token;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
+import org.fife.ui.rsyntaxtextarea.TokenTypes;
 import org.fife.ui.rtextarea.SearchContext;
 import org.fife.ui.rtextarea.SearchEngine;
 import org.jetbrains.annotations.Nullable;
@@ -196,13 +197,37 @@ public String getWordUnderCaret() {
 	public String getWordByPosition(int pos) {
 		try {
 			Token token = modelToToken(pos);
-			if (token != null) {
-				return token.getLexeme();
-			}
+			return getWordFromToken(token);
 		} catch (Exception e) {
 			LOG.error("Failed to get word at pos: {}", pos, e);
+			return null;
+		}
+	}
+
+	@Nullable
+	private static String getWordFromToken(@Nullable Token token) {
+		if (token == null) {
+			return null;
+		}
+		switch (token.getType()) {
+			case TokenTypes.NULL:
+			case TokenTypes.WHITESPACE:
+			case TokenTypes.SEPARATOR:
+			case TokenTypes.OPERATOR:
+				return null;
+
+			case TokenTypes.IDENTIFIER:
+				if (token.length() == 1) {
+					char ch = token.charAt(0);
+					if (ch == ';' || ch == '.') {
+						return null;
+					}
+				}
+				return token.getLexeme();
+
+			default:
+				return token.getLexeme();
 		}
-		return null;
 	}
 
 	/**