Fixed: Script/Class initializers order of assignment

Changed: Compound script has slot/const traits inside main script initializer

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java

@@ -3872,12 +3872,21 @@ public class Graph {
      * @throws InterruptedException On interrupt
      */
     public static GraphTextWriter graphToString(List<GraphTargetItem> tree, GraphTextWriter writer, LocalData localData) throws InterruptedException {
+        boolean lastNewLine = false;
         for (GraphTargetItem ti : tree) {
             if (!ti.isEmpty()) {
-                ti.toStringSemicoloned(writer, localData);
+                if (ti.hasSingleNewLineAround() && !lastNewLine) {
+                    writer.newLine();
+                }
+                ti.toStringSemicoloned(writer, localData);       
                 if (!ti.handlesNewLine()) {
                     writer.newLine();
                 }
+                lastNewLine = false;                
+                if (ti.hasSingleNewLineAround()) {
+                    writer.newLine();
+                    lastNewLine = true;
+                }
             }
         }
         return writer;

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java

@@ -767,6 +767,14 @@ public abstract class GraphTargetItem implements Serializable, Cloneable {
     public boolean handlesNewLine() {
         return false;
     }
+    
+    /**
+     * Checks whether this item needs single newline before and after.
+     * @return True if needs
+     */
+    public boolean hasSingleNewLineAround() {
+        return false;
+    }
 
     /**
      * Converts this to string with new line.

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/LocalData.java

@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool;
 import com.jpexs.decompiler.flash.abc.avm2.parser.script.AbcIndexing;
 import com.jpexs.decompiler.flash.abc.types.MethodBody;
 import com.jpexs.decompiler.flash.action.model.ConstantPool;
+import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.graph.DottedChain;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -78,6 +79,11 @@ public class LocalData {
      * ABC
      */
     public ABC abc;
+    
+    /**
+     * Script export mode
+     */
+    public ScriptExportMode exportMode;
 
     /**
      * Creates a new local data
@@ -99,9 +105,10 @@ public class LocalData {
      * @param localRegNames Local register names
      * @param fullyQualifiedNames Fully qualified names
      * @param seenMethods Seen methods
+     * @param exportMode
      * @return Local data
      */
-    public static LocalData create(List<MethodBody> callStack, AbcIndexing abcIndex, ABC abc, HashMap<Integer, String> localRegNames, List<DottedChain> fullyQualifiedNames, Set<Integer> seenMethods) {
+    public static LocalData create(List<MethodBody> callStack, AbcIndexing abcIndex, ABC abc, HashMap<Integer, String> localRegNames, List<DottedChain> fullyQualifiedNames, Set<Integer> seenMethods, ScriptExportMode exportMode) {
         LocalData localData = new LocalData();
         localData.abc = abc;
         localData.constantsAvm2 = abc.constants;
@@ -110,6 +117,7 @@ public class LocalData {
         localData.seenMethods = seenMethods;
         localData.abcIndex = abcIndex;
         localData.callStack = callStack;
+        localData.exportMode = exportMode;                
         return localData;
     }
 }