Customize syntax highlighting for bytecode

Author: rcx

libs/RSyntaxTextArea

@@ -1,13 +1,16 @@
 package the.bytecode.club.jda;
 
 import org.apache.commons.io.FileUtils;
+import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
+import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.jda.api.ExceptionUI;
 import the.bytecode.club.jda.api.Plugin;
 import the.bytecode.club.jda.api.PluginLoader;
 import the.bytecode.club.jda.gui.MainViewerGUI;
+import the.bytecode.club.jda.gui.fileviewer.BytecodeTokenizer;
 import the.bytecode.club.jda.gui.navigation.FileNavigationPane;
 import the.bytecode.club.jda.settings.Settings;
 
@@ -98,6 +101,9 @@ else if (!pluginsDir.isDirectory())
     }
 
     public static void onGUILoad() {
+        AbstractTokenMakerFactory atmf = (AbstractTokenMakerFactory)TokenMakerFactory.getDefaultInstance();
+        atmf.putMapping(BytecodeTokenizer.SYNTAX_STYLE_BYTECODE, "the.bytecode.club.jda.gui.fileviewer.BytecodeTokenizer");
+
         plugins.forEach(Plugin::onGUILoad);
     }
 

src/main/java/the/bytecode/club/jda/JDA.java

@@ -67,7 +67,6 @@ private void setup(Throwable e, String author) {
                 JDA.nl + JDA.nl + sw.toString());
         this.setLocationRelativeTo(null);
         this.setVisible(true);
-        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
     }
 
     private void setup(String e, String author) {
@@ -84,7 +83,6 @@ private void setup(String e, String author) {
         System.err.println(e);
         this.setLocationRelativeTo(null);
         this.setVisible(true);
-        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
     }
 
 }

src/main/java/the/bytecode/club/jda/api/ExceptionUI.java

@@ -104,7 +104,7 @@ public ArrayList<String> createPrint() {
                 if (firstLabel && parent.createLabelBrackets())
                     info.add("}");
 
-                line = printLabelnode((LabelNode) ain);
+                line = printLabelnode((LabelNode) ain) + ":";
 
                 if (parent.createLabelBrackets()) {
                     if (!firstLabel)
@@ -156,6 +156,7 @@ public ArrayList<String> createPrint() {
     protected String printVarInsnNode(VarInsnNode vin, ListIterator<?> it) {
         StringBuilder sb = new StringBuilder();
         sb.append(nameOpcode(vin.opcode()));
+        sb.append(" ");
         sb.append(vin.var);
         if (parent.createComments()) {
             if (vin.var == 0 && !Modifier.isStatic(mNode.access)) {

src/main/java/the/bytecode/club/jda/decompilers/bytecode/InstructionPrinter.java

@@ -6,6 +6,8 @@
 import the.bytecode.club.jda.JDA;
 import the.bytecode.club.jda.api.ExceptionUI;
 import the.bytecode.club.jda.decompilers.JDADecompiler;
+import the.bytecode.club.jda.decompilers.bytecode.BytecodeDecompiler;
+import the.bytecode.club.jda.gui.fileviewer.BytecodeTokenizer;
 import the.bytecode.club.jda.gui.fileviewer.ClassViewer;
 import the.bytecode.club.jda.settings.Settings;
 
@@ -36,7 +38,7 @@ public PaneUpdaterThread(ClassViewer viewer, JDADecompiler decompiler, int paneI
     public void run() {
         try {
             RSyntaxTextArea panelArea = new RSyntaxTextArea();
-            panelArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
+            panelArea.setSyntaxEditingStyle(decompiler instanceof BytecodeDecompiler ? BytecodeTokenizer.SYNTAX_STYLE_BYTECODE : SyntaxConstants.SYNTAX_STYLE_JAVA);
             panelArea.setCodeFoldingEnabled(true);
             panelArea.setAntiAliasingEnabled(true);
             final RTextScrollPane scrollPane = new RTextScrollPane(panelArea);