Code folding for bytecode

Author: rcx

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

@@ -3,13 +3,16 @@
 import org.apache.commons.io.FileUtils;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
+import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser;
+import org.fife.ui.rsyntaxtextarea.folding.FoldParserManager;
 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.BytecodeFoldParser;
 import the.bytecode.club.jda.gui.fileviewer.BytecodeTokenizer;
 import the.bytecode.club.jda.gui.navigation.FileNavigationPane;
 import the.bytecode.club.jda.settings.Settings;
@@ -102,7 +105,8 @@ 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");
+        atmf.putMapping(BytecodeTokenizer.SYNTAX_STYLE_BYTECODE, BytecodeTokenizer.class.getName());
+        FoldParserManager.get().addFoldParserMapping(BytecodeTokenizer.SYNTAX_STYLE_BYTECODE, new BytecodeFoldParser());
 
         plugins.forEach(Plugin::onGUILoad);
     }

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

@@ -109,7 +109,7 @@ public ArrayList<String> createPrint() {
                 if (parent.createLabelBrackets()) {
                     if (!firstLabel)
                         firstLabel = true;
-                    line += " { // http://google.com";
+                    line += " {";
                 }
 
                 if (parent.appendHandlerComments()) {

src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeFoldParser.java

@@ -0,0 +1,6 @@
+package the.bytecode.club.jda.gui.fileviewer;
+
+import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser;
+
+public class BytecodeFoldParser extends CurlyFoldParser {
+}

src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeTokenizer.flex

@@ -7,7 +7,7 @@ import org.fife.ui.rsyntaxtextarea.*;
 
 
 /**
- * Scanner for the JDA Bytecode.<p>
+ * Scanner the JDA Bytecode.<p>
  *
  * This implementation was created using
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.1; however, the generated file
@@ -525,325 +525,7 @@ URL						= (((https?|f(tp|ile))"://"|"www.")({URLCharacters}{URLEndCharacter})?)
 	/* Booleans. */
 	{BooleanLiteral}			{ addToken(Token.LITERAL_BOOLEAN); }
 
-	/* java.lang classes */
-	"Appendable" |
-	"AutoCloseable" |
-	"CharSequence" |
-	"Cloneable" |
-	"Comparable" |
-	"Iterable" |
-	"Readable" |
-	"Runnable" |
-	"Thread.UncaughtExceptionHandler" |
-	"Boolean" |
-	"Byte" |
-	"Character" |
-	"Character.Subset" |
-	"Character.UnicodeBlock" |
-	"Class" |
-	"ClassLoader" |
-	"ClassValue" |
-	"Compiler" |
-	"Double" |
-	"Enum" |
-	"Float" |
-	"InheritableThreadLocal" |
-	"Integer" |
-	"Long" |
-	"Math" |
-	"Number" |
-	"Object" |
-	"Package" |
-	"Process" |
-	"ProcessBuilder" |
-	"ProcessBuilder.Redirect" |
-	"Runtime" |
-	"RuntimePermission" |
-	"SecurityManager" |
-	"Short" |
-	"StackTraceElement" |
-	"StrictMath" |
-	"String" |
-	"StringBuffer" |
-	"StringBuilder" |
-	"System" |
-	"Thread" |
-	"ThreadGroup" |
-	"ThreadLocal" |
-	"Throwable" |
-	"Void" |
-	"Character.UnicodeScript" |
-	"ProcessBuilder.Redirect.Type" |
-	"Thread.State" |
-	"ArithmeticException" |
-	"ArrayIndexOutOfBoundsException" |
-	"ArrayStoreException" |
-	"ClassCastException" |
-	"ClassNotFoundException" |
-	"CloneNotSupportedException" |
-	"EnumConstantNotPresentException" |
-	"Exception" |
-	"IllegalAccessException" |
-	"IllegalArgumentException" |
-	"IllegalMonitorStateException" |
-	"IllegalStateException" |
-	"IllegalThreadStateException" |
-	"IndexOutOfBoundsException" |
-	"InstantiationException" |
-	"InterruptedException" |
-	"NegativeArraySizeException" |
-	"NoSuchFieldException" |
-	"NoSuchMethodException" |
-	"NullPointerException" |
-	"NumberFormatException" |
-	"RuntimeException" |
-	"SecurityException" |
-	"StringIndexOutOfBoundsException" |
-	"TypeNotPresentException" |
-	"UnsupportedOperationException" |
-	"AbstractMethodError" |
-	"AssertionError" |
-	"BootstrapMethodError" |
-	"ClassCircularityError" |
-	"ClassFormatError" |
-	"Error" |
-	"ExceptionInInitializerError" |
-	"IllegalAccessError" |
-	"IncompatibleClassChangeError" |
-	"InstantiationError" |
-	"InternalError" |
-	"LinkageError" |
-	"NoClassDefFoundError" |
-	"NoSuchFieldError" |
-	"NoSuchMethodError" |
-	"OutOfMemoryError" |
-	"StackOverflowError" |
-	"ThreadDeath" |
-	"UnknownError" |
-	"UnsatisfiedLinkError" |
-	"UnsupportedClassVersionError" |
-	"VerifyError" |
-	"VirtualMachineError" |
-
-	/* java.io classes*/
-    "Closeable" |
-    "DataInput" |
-    "DataOutput" |
-    "Externalizable" |
-    "FileFilter" |
-    "FilenameFilter" |
-    "Flushable" |
-    "ObjectInput" |
-    "ObjectInputValidation" |
-    "ObjectOutput" |
-    "ObjectStreamConstants" |
-    "Serializable" |
-
-    "BufferedInputStream" |
-    "BufferedOutputStream" |
-    "BufferedReader" |
-    "BufferedWriter" |
-    "ByteArrayInputStream" |
-    "ByteArrayOutputStream" |
-    "CharArrayReader" |
-    "CharArrayWriter" |
-    "Console" |
-    "DataInputStream" |
-    "DataOutputStream" |
-    "File" |
-    "FileDescriptor" |
-    "FileInputStream" |
-    "FileOutputStream" |
-    "FilePermission" |
-    "FileReader" |
-    "FileWriter" |
-    "FilterInputStream" |
-    "FilterOutputStream" |
-    "FilterReader" |
-    "FilterWriter" |
-    "InputStream" |
-    "InputStreamReader" |
-    "LineNumberInputStream" |
-    "LineNumberReader" |
-    "ObjectInputStream" |
-    "ObjectInputStream.GetField" |
-    "ObjectOutputStream" |
-    "ObjectOutputStream.PutField" |
-    "ObjectStreamClass" |
-    "ObjectStreamField" |
-    "OutputStream" |
-    "OutputStreamWriter" |
-    "PipedInputStream" |
-    "PipedOutputStream" |
-    "PipedReader" |
-    "PipedWriter" |
-    "PrintStream" |
-    "PrintWriter" |
-    "PushbackInputStream" |
-    "PushbackReader" |
-    "RandomAccessFile" |
-    "Reader" |
-    "SequenceInputStream" |
-    "SerializablePermission" |
-    "StreamTokenizer" |
-    "StringBufferInputStream" |
-    "StringReader" |
-    "StringWriter" |
-    "Writer" |
-
-    "CharConversionException" |
-    "EOFException" |
-    "FileNotFoundException" |
-    "InterruptedIOException" |
-    "InvalidClassException" |
-    "InvalidObjectException" |
-    "IOException" |
-    "NotActiveException" |
-    "NotSerializableException" |
-    "ObjectStreamException" |
-    "OptionalDataException" |
-    "StreamCorruptedException" |
-    "SyncFailedException" |
-    "UncheckedIOException" |
-    "UnsupportedEncodingException" |
-    "UTFDataFormatException" |
-    "WriteAbortedException" |
-
-    "IOError" |
-
-	/* java.util classes */
-    "Collection" |
-    "Comparator" |
-    "Deque" |
-    "Enumeration" |
-    "EventListener" |
-    "Formattable" |
-    "Iterator" |
-    "List" |
-    "ListIterator" |
-    "Map" |
-    "Map.Entry" |
-    "NavigableMap" |
-    "NavigableSet" |
-    "Observer" |
-    "PrimitiveIterator" |
-    "PrimitiveIterator.OfDouble" |
-    "PrimitiveIterator.OfInt" |
-    "PrimitiveIterator.OfLong" |
-    "Queue" |
-    "RandomAccess" |
-    "Set" |
-    "SortedMap" |
-    "SortedSet" |
-    "Spliterator" |
-    "Spliterator.OfDouble" |
-    "Spliterator.OfInt" |
-    "Spliterator.OfLong" |
-    "Spliterator.OfPrimitive" |
-
-    "AbstractCollection" |
-    "AbstractList" |
-    "AbstractMap" |
-    "AbstractMap.SimpleEntry" |
-    "AbstractMap.SimpleImmutableEntry" |
-    "AbstractQueue" |
-    "AbstractSequentialList" |
-    "AbstractSet" |
-    "ArrayDeque" |
-    "ArrayList" |
-    "Arrays" |
-    "Base64" |
-    "Base64.Decoder" |
-    "Base64.Encoder" |
-    "BitSet" |
-    "Calendar" |
-    "Calendar.Builder" |
-    "Collections" |
-    "Currency" |
-    "Date" |
-    "Dictionary" |
-    "DoubleSummaryStatistics" |
-    "EnumMap" |
-    "EnumSet" |
-    "EventListenerProxy" |
-    "EventObject" |
-    "FormattableFlags" |
-    "Formatter" |
-    "GregorianCalendar" |
-    "HashMap" |
-    "HashSet" |
-    "Hashtable" |
-    "IdentityHashMap" |
-    "IntSummaryStatistics" |
-    "LinkedHashMap" |
-    "LinkedHashSet" |
-    "LinkedList" |
-    "ListResourceBundle" |
-    "Locale" |
-    "Locale.Builder" |
-    "Locale.LanguageRange" |
-    "LongSummaryStatistics" |
-    "Objects" |
-    "Observable" |
-    "Optional" |
-    "OptionalDouble" |
-    "OptionalInt" |
-    "OptionalLong" |
-    "PriorityQueue" |
-    "Properties" |
-    "PropertyPermission" |
-    "PropertyResourceBundle" |
-    "Random" |
-    "ResourceBundle" |
-    "ResourceBundle.Control" |
-    "Scanner" |
-    "ServiceLoader" |
-    "SimpleTimeZone" |
-    "Spliterators" |
-    "Spliterators.AbstractDoubleSpliterator" |
-    "Spliterators.AbstractIntSpliterator" |
-    "Spliterators.AbstractLongSpliterator" |
-    "Spliterators.AbstractSpliterator" |
-    "SpliteratorRandom" |
-    "Stack" |
-    "StringJoiner" |
-    "StringTokenizer" |
-    "Timer" |
-    "TimerTask" |
-    "TimeZone" |
-    "TreeMap" |
-    "TreeSet" |
-    "UUID" |
-    "Vector" |
-    "WeakHashMap" |
-
-    "Formatter.BigDecimalLayoutForm" |
-    "Locale.Category" |
-    "Locale.FilteringMode" |
-
-    "ConcurrentModificationException" |
-    "DuplicateFormatFlagsException" |
-    "EmptyStackException" |
-    "FormatFlagsConversionMismatchException" |
-    "FormatterClosedException" |
-    "IllegalFormatCodePointException" |
-    "IllegalFormatConversionException" |
-    "IllegalFormatException" |
-    "IllegalFormatFlagsException" |
-    "IllegalFormatPrecisionException" |
-    "IllegalFormatWidthException" |
-    "IllformedLocaleException" |
-    "InputMismatchException" |
-    "InvalidPropertiesFormatException" |
-    "MissingFormatArgumentException" |
-    "MissingFormatWidthException" |
-    "MissingResourceException" |
-    "NoSuchElementException" |
-    "TooManyListenersException" |
-    "UnknownFormatConversionException" |
-    "UnknownFormatFlagsException" |
-
-    "ServiceConfigurationError" 		{ addToken(Token.FUNCTION); }
+//    "TODO" 		{ addToken(Token.FUNCTION); }
 
 	{LineTerminator}				{ addNullToken(); return firstToken; }