diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java index 8dfcadfd1..b83290982 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java @@ -91,7 +91,7 @@ public class FunctionActionItem extends ActionItem { } ret += hilight(pname, highlight); } - ret += hilight(")", highlight) + "\r\n" + hilight("{", highlight) + "\r\n" + Graph.graphToString(actions, highlight, constants) + "}"; + ret += hilight(")", highlight) + "\r\n" + hilight("{", highlight) + "\r\n" + Graph.graphToString(actions, highlight, constants) + hilight("}", highlight); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/graph/Graph.java b/trunk/src/com/jpexs/decompiler/graph/Graph.java index f58b4c09d..86ce3e7c8 100644 --- a/trunk/src/com/jpexs/decompiler/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/graph/Graph.java @@ -2227,24 +2227,22 @@ public class Graph { if (strippedP.startsWith(":")) { continue; } - if (Highlighting.stripHilights(parts[p]).equals(INDENTOPEN)) { + strippedP = Highlighting.stripHilights(parts[p]).trim(); + if (strippedP.equals(INDENTOPEN)) { level++; continue; } - if (Highlighting.stripHilights(parts[p]).equals(INDENTCLOSE)) { + if (strippedP.equals(INDENTCLOSE)) { level--; continue; } - if (Highlighting.stripHilights(parts[p]).equals("}")) { - level--; - } - if (Highlighting.stripHilights(parts[p]).equals("};")) { + if (strippedP.startsWith("}")) { level--; } ret.append(tabString(level)); ret.append(parts[p]); ret.append("\r\n"); - if (Highlighting.stripHilights(parts[p]).equals("{")) { + if (strippedP.equals("{")) { level++; } }