update fernFlower config

Author: Ecdcaeb

src/main/java/cn/enaium/joe/service/decompiler/VineFlowerDecompiler.java

@@ -49,7 +49,7 @@ public class VineFlowerDecompiler implements IDecompiler{
             } else if (v.equals("false")) {
                 v = "0";
             }
-            hashMap.put(entry.getKey(), v);
+            hashMap.put(entry.getKey().replace('_', '-'), v);
         }
         return Collections.unmodifiableMap(hashMap);});
 

src/main/java/cn/enaium/joe/util/config/extend/VineFlowerConfig.java

@@ -33,6 +33,7 @@
  */
 @SuppressWarnings("unused")
 public class VineFlowerConfig extends Config {
+
     public EnableValue rbr = new EnableValue("Remove Bridge Methods", true, "Removes any methods that are marked as bridge from the decompiled output.");
     public EnableValue rsy = new EnableValue("Remove Synthetic Methods And Fields", true, "Removes any methods and fields that are marked as synthetic from the decompiled output.");
     public EnableValue din = new EnableValue("Decompile Inner Classes", true, "Process inner classes and add them to the decompiled output.");
@@ -69,6 +70,7 @@ public class VineFlowerConfig extends Config {
     public EnableValue ovr = new EnableValue("Override Annotation", true, "Display override annotations for methods known to the decompiler.");
     public EnableValue ssp = new EnableValue("Second-Pass Stack Simplification", true, "Simplify variables across stack bounds to resugar complex statements.");
     public EnableValue vvm = new EnableValue("[Experimental] Verify Variable Merges", false, "Tries harder to verify the validity of variable merges. If there are strange variable recompilation issues, this is a good place to start.");
+    public EnableValue old_try_dedup = new EnableValue("[Experimental] Use old try deduplication", false, "Use the old try deduplication algorithm for methods with obfuscated exceptions, which inserts dummy exception handlers instead of duplicating blocks");
     public EnableValue iec = new EnableValue("Include Entire Classpath", false, "Give the decompiler information about every jar on the classpath.");
     public StringValue jrt = new StringValue("Include Java Runtime", "", "Give the decompiler information about the Java runtime, either 1 or current for the current runtime, or a path to another runtime");
     public EnableValue ega = new EnableValue("Explicit Generic Arguments", false, "Put explicit diamond generic arguments on method calls.");
@@ -92,7 +94,9 @@ public class VineFlowerConfig extends Config {
     public EnableValue fji = new EnableValue("Force JSR inline", false, "Forces the processing of JSR instructions even if the class files shouldn't contain it (Java 7+)");
     public EnableValue dtt = new EnableValue("Dump Text Tokens", false, "Dump Text Tokens on each class file");
     public EnableValue rim = new EnableValue("Remove Imports", false, "Remove import statements from the decompiled code");
-    public EnableValue mcs = new EnableValue("Mark Corresponding Synthetics", false, "Mark lambdas and anonymous and local classes with their respective synthetic constructs"); // not auto, might be fixed at https://github.com/Vineflower/vineflower/pull/443 or other operate, now we just human-bot
+    public EnableValue mcs = new EnableValue("Mark Corresponding Synthetics", false, "Mark lambdas and anonymous and local classes with their respective synthetic constructs");
+    public StringValue excluded_classes = new StringValue("Excluded Classes", "", "Exclude classes from decompilation if their fully qualified names match the specified regular expression.");
+    public StringValue validate_inner_classes_names = new StringValue("Validate inner classes names", "1", "Validates that the inner class name is correct (if it is separated using '$' for example BaseClass$InnerClass). If not then inner class won't be processed.");
 
     public VineFlowerConfig() {
         super("VineFlower", Set.of(VineFlowerDecompiler.customProperties));

src/test/java/cn/enaium/joe/asm/GenerateDecompilerConfigTest.java

@@ -18,9 +18,11 @@
 
 import cn.enaium.joe.util.ImagineBreakerHelper;
 import com.strobel.decompiler.languages.java.JavaFormattingOptions;
+import org.jetbrains.java.decompiler.api.DecompilerOption;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.junit.jupiter.api.Test;
+import org.tinylog.Logger;
 
 import java.lang.reflect.Field;
 import java.util.Map;
@@ -43,35 +45,46 @@ public void fernFlower() throws IllegalAccessException {
             if (field.isAnnotationPresent(IFernflowerPreferences.Name.class) && field.isAnnotationPresent(IFernflowerPreferences.Description.class)) {
                 try{
                     String name = field.getAnnotation(IFernflowerPreferences.Name.class).value();
-                    String fieldName = field.getAnnotation(IFernflowerPreferences.ShortName.class).value();
+                    String fieldName = field.isAnnotationPresent(IFernflowerPreferences.ShortName.class) ? field.getAnnotation(IFernflowerPreferences.ShortName.class).value() : ((String)field.get(null)).replace('-', '_');
                     String description = field.getAnnotation(IFernflowerPreferences.Description.class).value();
-                    String type = field.getAnnotation(IFernflowerPreferences.Type.class).value();
-                    Object o = defaults.get((String)field.get(null));
+                    DecompilerOption.Type type = field.isAnnotationPresent(IFernflowerPreferences.Type.class) ? field.getAnnotation(IFernflowerPreferences.Type.class).value() : null;
+                    Object defaultValue = defaults.get((String)field.get(null));
+                    String extra = null;
 
-                    if (o != null) {
-                        if ("bool".equals(type)){
-                            if ("1".equals(o)) {
-                                o = Boolean.TRUE;
-                            } else if ("0".equals(o)) {
-                                o = Boolean.FALSE;
+                    if (defaultValue != null) {
+                        if ("mcs".equals(fieldName)) {
+                            type = DecompilerOption.Type.BOOLEAN;
+                            extra = " not auto, might be fixed at https://github.com/Vineflower/vineflower/pull/443 or other operate, now we just human-bot";
+                        }
+                        if (type == DecompilerOption.Type.BOOLEAN) {
+                            if ("1".equals(defaultValue)) {
+                                defaultValue = Boolean.TRUE;
+                            } else if ("0".equals(defaultValue)) {
+                                defaultValue = Boolean.FALSE;
                             }
-                        } else if ("string".equals(type)){
+                        }
+                        else if (DecompilerOption.Type.STRING == type){
                             if ("log".equals(fieldName))
-                                o = IFernflowerLogger.Severity.INFO;
-                            else o = String.valueOf(o);
-                        } else if ("int".equals(type)){
-                            o = Integer.parseInt(String.valueOf(o));
+                                defaultValue = IFernflowerLogger.Severity.INFO;
+                            else defaultValue = String.valueOf(defaultValue);
+                        } else if (DecompilerOption.Type.INTEGER == type){
+                            defaultValue = Integer.parseInt(String.valueOf(defaultValue));
                         }
-                        System.out.println(buildConfig(fieldName, name, description, o));
+                        System.out.println(buildConfig(fieldName, name, description, defaultValue));
                     }
                 }catch (Throwable e){
-                    e.printStackTrace();
+                    Logger.error(e);
                 }
             }
         }
     }
-
     public static String buildConfig(String fieldName, String name, String desc, Object defaultValue){
+        return buildConfig(fieldName, name, desc, defaultValue, null);
+    }
+
+    public static String buildConfig(String fieldName, String name, String desc, Object defaultValue, String extra){
+        desc = desc.replace('\"', '\'');
+
         String type = null;
         if (defaultValue instanceof Boolean) {
             type = "EnableValue";
@@ -107,6 +120,10 @@ public static String buildConfig(String fieldName, String name, String desc, Obj
         }
         stringBuilder.append(");");
 
+        if (extra != null) {
+            stringBuilder.append("  //").append(extra);
+        }
+
         return stringBuilder.toString();
     }