jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix(gui): use simple token maker as default to avoid parsing error (#2669)

Browse Source
This commit is contained in:
Skylot
2025-10-23 22:21:30 +01:00
parent 20ed13936a
commit 1becfa9977
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
+2
View File
@@ -71,6 +71,8 @@ public abstract class AbstractCodeArea extends RSyntaxTextArea {
if (tokenMakerFactory instanceof AbstractTokenMakerFactory) {
AbstractTokenMakerFactory atmf = (AbstractTokenMakerFactory) tokenMakerFactory;
atmf.putMapping(SYNTAX_STYLE_SMALI, "jadx.gui.ui.codearea.SmaliTokenMaker");
// use simple token maker instead default PlainTextTokenMaker to avoid parse errors
atmf.putMapping(SYNTAX_STYLE_NONE, "jadx.gui.ui.codearea.SimpleTokenMaker");
} else {
throw new JadxRuntimeException("Unexpected TokenMakerFactory instance: " + tokenMakerFactory.getClass());
}
jadx-gui/src/main/java/jadx/gui/ui/codearea/SimpleTokenMaker.java
+30
View File
@@ -0,0 +1,30 @@
package jadx.gui.ui.codearea;
import javax.swing.text.Segment;
import org.fife.ui.rsyntaxtextarea.Token;
import org.fife.ui.rsyntaxtextarea.TokenImpl;
import org.fife.ui.rsyntaxtextarea.TokenMakerBase;
import org.fife.ui.rsyntaxtextarea.TokenTypes;
/**
* Very simple token maker to use only one token per line without any parsing
*/
@SuppressWarnings("unused") // class registered by name in {@link AbstractCodeArea}
public class SimpleTokenMaker extends TokenMakerBase {
private final TokenImpl token;
public SimpleTokenMaker() {
token = new TokenImpl();
token.setType(TokenTypes.IDENTIFIER);
}
@Override
public Token getTokenList(Segment segment, int initialTokenType, int startOffset) {
token.text = segment.array;
token.textOffset = startOffset;
token.textCount = segment.count;
token.setOffset(startOffset);
return token;
}
}