LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-03 04:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

as2 export fix, as2 edit fix (prefix, suffix problem)

Browse Source
This commit is contained in:
Honfika
2013-11-01 15:01:34 +01:00
parent 9b5acbcaee
commit 6d264576e4
12 changed files with 124 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
View File

@@ -174,9 +174,12 @@ public class ActionPanel extends JPanel implements ActionListener {
if (actions == null) {
actions = src.getActions(SWF.DEFAULT_VERSION);
}
HilightedText text = Action.actionsToSource(actions, SWF.DEFAULT_VERSION, src.toString()/*FIXME?*/, true, 0);
List<Highlighting> hilights = text.instructionHilights;
String srcNoHex = text.text;
HilightedTextWriter writer = new HilightedTextWriter(true);
src.getActionSourcePrefix(writer);
Action.actionsToSource(actions, SWF.DEFAULT_VERSION, src.toString()/*FIXME?*/, writer);
src.getActionSourceSuffix(writer);
List<Highlighting> hilights = writer.instructionHilights;
String srcNoHex = writer.toString();
cache.put(src, new CachedScript(srcNoHex, hilights));
}
}
@@ -349,7 +352,6 @@ public class ActionPanel extends JPanel implements ActionListener {
setHex(getExportMode());
if (Configuration.getConfig("decompile", true)) {
decompiledEditor.setText("//" + translate("work.decompiling") + "...");
String stripped = "";
if (!useCache) {
uncache(asm);
}
@@ -358,8 +360,7 @@ public class ActionPanel extends JPanel implements ActionListener {
decompiledHilights = sc.hilights;
lastDecompiled = sc.text;
lastASM = asm;
stripped = lastDecompiled;
decompiledEditor.setText(asm.getActionSourcePrefix() + Helper.indentRows(asm.getActionSourceIndent(), lastDecompiled, HilightedTextWriter.INDENT_STRING) + asm.getActionSourceSuffix());
decompiledEditor.setText(lastDecompiled);
}
setEditMode(false);
setDecompiledEditMode(false);
@@ -559,7 +560,6 @@ public class ActionPanel extends JPanel implements ActionListener {
}
decompiledEditor.getCaret().setVisible(true);
int pos = decompiledEditor.getCaretPosition();
System.out.println("pos: " + pos);
Highlighting h = Highlighting.search(decompiledHilights, pos);
if (h != null) {
Highlighting h2 = Highlighting.search(disassembledHilights, "offset", h.getPropertyString("offset"));
@@ -620,15 +620,12 @@ public class ActionPanel extends JPanel implements ActionListener {
return;
}
String pref = lastASM.getActionSourcePrefix();
int lastPos = decompiledEditor.getCaretPosition();
int lastLine = decompiledEditor.getLine();
int prefLines = Helper.getLineCount(pref);
int prefLines = lastASM.getPrefixLineCount();
if (val) {
String newText = lastDecompiled;
String newText = lastASM.removePrefixAndSuffix(lastDecompiled);
decompiledEditor.setText(newText);
if (lastLine > -1) {
int newpos = lastPos - pref.length();
if (lastLine - prefLines >= 0) {
decompiledEditor.gotoLine(lastLine - prefLines + 1);
}
@@ -641,7 +638,7 @@ public class ActionPanel extends JPanel implements ActionListener {
decompiledEditor.getCaret().setVisible(true);
decLabel.setIcon(View.getIcon("editing16"));
} else {
String newText = pref + Helper.indentRows(lastASM.getActionSourceIndent(), lastDecompiled, HilightedTextWriter.INDENT_STRING) + lastASM.getActionSourceSuffix();
String newText = lastDecompiled;
decompiledEditor.setText(newText);
if (lastLine > -1) {
decompiledEditor.gotoLine(lastLine + prefLines + 1);