Clean up field writing to reduce redundancies

Author: sschr15

src/org/jetbrains/java/decompiler/main/ClassWriter.java

@@ -391,38 +391,39 @@ public void writeClass(ClassNode node, TextBuffer buffer, int indent) {
         hasContent.set(true);
       };
 
-      boolean enumFields = false;
-
+      // fields
       List<StructRecordComponent> components = cl.getRecordComponents();
 
-      // FIXME: fields don't have line mappings
-      // fields
+      List<StructField> enumFields = new ArrayList<>();
+      List<StructField> nonEnumFields = new ArrayList<>();
 
-      // Find the last field marked as an enum
-      int maxEnumIdx = 0;
-      for (int i = 0; i < cl.getFields().size(); i++) {
-        StructField fd = cl.getFields().get(i);
+      for (StructField fd : cl.getFields()) {
         boolean isEnum = fd.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
         if (isEnum) {
-          maxEnumIdx = i;
+          enumFields.add(fd);
+        } else {
+          nonEnumFields.add(fd);
         }
       }
 
-      List<StructField> deferredEnumFields = new ArrayList<>();
-
-      // Find any regular fields mixed in with the enum fields
-      // This is invalid but allowed in bytecode.
-      for (int i = 0; i < cl.getFields().size(); i++) {
-        StructField fd = cl.getFields().get(i);
-        boolean isEnum = fd.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
-        if (i < maxEnumIdx && !isEnum) {
-          deferredEnumFields.add(fd);
+      boolean enums = false;
+      for (StructField fd : enumFields) {
+        if (enums) {
+          buffer.append(',').appendLineSeparator();
         }
+        enums = true;
+
+        haveContent.run();
+        writeField(buffer, indent, fd, wrapper);
       }
 
-      for (StructField fd : cl.getFields()) {
+      if (enums) {
+        buffer.append(';').appendLineSeparator();
+      }
+
+      for (StructField fd : nonEnumFields) {
         boolean hide = fd.isSynthetic() && DecompilerContext.getOption(IFernflowerPreferences.REMOVE_SYNTHETIC) ||
-                       wrapper.getHiddenMembers().contains(InterpreterUtil.makeUniqueKey(fd.getName(), fd.getDescriptor())) || deferredEnumFields.contains(fd);
+                       wrapper.getHiddenMembers().contains(InterpreterUtil.makeUniqueKey(fd.getName(), fd.getDescriptor()));
         if (hide) continue;
 
         if (components != null && fd.getAccessFlags() == (CodeConstants.ACC_FINAL | CodeConstants.ACC_PRIVATE) &&
@@ -431,45 +432,14 @@ public void writeClass(ClassNode node, TextBuffer buffer, int indent) {
           continue;
         }
 
-        boolean isEnum = fd.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
-        if (isEnum) {
-          if (enumFields) {
-            buffer.append(',').appendLineSeparator();
-          }
-          enumFields = true;
-        }
-        else if (enumFields) {
-          buffer.append(';');
+        if (enums) {
+          // Add an extra line break between enums and non-enum fields
           buffer.appendLineSeparator();
-          buffer.appendLineSeparator();
-          enumFields = false;
-
-          // If the fields after are non enum, readd the fields found scattered throughout the enum
-          for (StructField fd2 : deferredEnumFields) {
-            TextBuffer fieldBuffer = new TextBuffer();
-            writeField(wrapper, cl, fd2, fieldBuffer, indent + 1);
-            fieldBuffer.clearUnassignedBytecodeMappingData();
-            buffer.append(fieldBuffer);
-          }
+          enums = false;
         }
 
-        TextBuffer fieldBuffer = new TextBuffer();
-        writeField(wrapper, cl, fd, fieldBuffer, indent + 1);
-        fieldBuffer.clearUnassignedBytecodeMappingData();
         haveContent.run();
-        buffer.append(fieldBuffer);
-      }
-
-      if (enumFields) {
-        buffer.append(';').appendLineSeparator();
-
-        // If we end with enum fields, readd the fields found mixed in
-        for (StructField fd2 : deferredEnumFields) {
-          TextBuffer fieldBuffer = new TextBuffer();
-          writeField(wrapper, cl, fd2, fieldBuffer, indent + 1);
-          fieldBuffer.clearUnassignedBytecodeMappingData();
-          buffer.append(fieldBuffer);
-        }
+        writeField(buffer, indent, fd, wrapper);
       }
 
       // methods
@@ -810,6 +780,13 @@ private static boolean isSuperClassSealed(StructClass cl) {
     return false;
   }
 
+  private void writeField(TextBuffer buffer, int indent, StructField fd, ClassWrapper wrapper) {
+    TextBuffer fieldBuffer = new TextBuffer();
+    writeField(wrapper, wrapper.getClassStruct(), fd, fieldBuffer, indent + 1);
+    fieldBuffer.clearUnassignedBytecodeMappingData();
+    buffer.append(fieldBuffer);
+  }
+
   public void writeField(ClassWrapper wrapper, StructClass cl, StructField fd, TextBuffer buffer, int indent) {
     if (RecordHelper.isHiddenRecordField(cl.getRecordComponents(), fd)) {
       return;

testData/results/pkg/TestEnumStaticField.dec

@@ -3,6 +3,7 @@ package pkg;
 public enum TestEnumStaticField {
    TEST_1,
    TEST_2;
+
    public static Integer field;
 }
 

testData/results/pkg/TestEnumStaticField2.dec

@@ -3,6 +3,7 @@ package pkg;
 public enum TestEnumStaticField2 {
    TEST_1,
    TEST_2;
+
    public static Integer field;
 }
 

testData/results/pkg/TestJava11StringConcat.dec

@@ -34,12 +34,12 @@ class 'pkg/TestJava11StringConcat' {
       0      8
       1      8
       2      8
-      3      8
-      4      8
-      5      8
       6      8
       7      8
       8      8
+      9      8
+      a      8
+      b      8
    }
 
    method 'testEmptyPrefix (I)Ljava/lang/String;' {

testData/results/pkg/TestSwitchPatternMatching13.dec

@@ -114,15 +114,18 @@ class 'pkg/TestSwitchPatternMatching13' {
       51      15
       52      15
       53      15
+      54      15
+      55      15
+      56      15
       57      15
       58      15
       59      15
       5a      15
       5b      15
-      5c      15
-      5d      15
-      5e      15
-      5f      16
+      5c      16
+      63      17
+      64      17
+      65      17
       66      17
       67      17
       68      17
@@ -131,18 +134,18 @@ class 'pkg/TestSwitchPatternMatching13' {
       6b      17
       6c      17
       6d      17
-      6e      17
-      6f      17
-      70      17
+      76      18
+      77      18
+      78      18
       79      18
       7a      18
       7b      18
       7c      18
       7d      18
-      7e      18
-      7f      18
-      80      18
-      81      19
+      7e      19
+      85      20
+      86      20
+      87      20
       88      20
       89      20
       8a      20
@@ -151,84 +154,81 @@ class 'pkg/TestSwitchPatternMatching13' {
       8d      20
       8e      20
       8f      20
-      90      20
-      91      20
-      92      20
+      98      21
+      99      21
+      9a      21
       9b      21
       9c      21
       9d      21
       9e      21
       9f      21
-      a0      21
-      a1      21
-      a2      21
+      a0      23
+      a1      23
+      a2      23
       a3      23
       a4      23
       a5      23
       a6      23
-      a7      23
-      a8      23
-      a9      23
+      aa      24
+      ab      24
+      ac      24
       ad      24
       ae      24
       af      24
       b0      24
       b1      24
-      b2      24
-      b3      24
-      b4      24
-      bc      27
-      bd      27
+      b9      27
+      ba      27
+      bb      28
+      bc      28
+      bd      28
       be      28
       bf      28
       c0      28
       c1      28
       c2      28
-      c3      28
-      c4      28
-      c5      28
+      c3      29
+      c4      29
+      c5      29
       c6      29
       c7      29
       c8      29
       c9      29
       ca      29
-      cb      29
-      cc      29
-      cd      29
+      cb      32
+      cc      32
+      cd      32
       ce      32
       cf      32
       d0      32
       d1      32
       d2      32
-      d3      32
-      d4      32
-      d5      32
-      d6      33
+      d3      33
+      d6      6
+      d7      6
+      d8      6
       d9      6
       da      6
       db      6
       dc      6
       dd      6
-      de      6
-      df      6
-      e0      6
+      de      7
+      df      7
+      e0      7
       e1      7
       e2      7
       e3      7
       e4      7
       e5      7
-      e6      7
-      e7      7
-      e8      7
+      e9      35
+      ea      35
+      eb      35
       ec      35
       ed      35
       ee      35
       ef      35
       f0      35
-      f1      35
-      f2      35
-      f3      35
-      f7      37
+      f4      37
    }
 }
 
@@ -261,4 +261,4 @@ Lines mapping:
 28 <-> 8
 32 <-> 36
 34 <-> 38
-44 <-> 47
+44 <-> 47

testData/results/pkg/TestSwitchPatternMatching14.dec

@@ -81,40 +81,40 @@ class 'pkg/TestSwitchPatternMatching14' {
       39      15
       3a      15
       3b      15
+      3c      15
+      3d      15
+      3e      15
       3f      15
       40      15
       41      15
       42      15
       43      15
-      44      15
-      45      15
-      46      15
-      47      16
+      44      16
+      47      6
+      48      6
+      49      6
       4a      6
       4b      6
       4c      6
       4d      6
       4e      6
-      4f      6
-      50      6
-      51      6
+      4f      7
+      50      7
+      51      7
       52      7
       53      7
       54      7
       55      7
       56      7
-      57      7
-      58      7
-      59      7
+      5a      18
+      5b      18
+      5c      18
       5d      18
       5e      18
       5f      18
       60      18
       61      18
-      62      18
-      63      18
-      64      18
-      65      20
+      62      20
    }
 }
 
@@ -136,4 +136,4 @@ Lines mapping:
 14 <-> 8
 18 <-> 19
 20 <-> 21
-30 <-> 30
+30 <-> 30