From e9f20112a7d6642453c4296fa552b8c8427a1024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 20 Aug 2016 18:35:29 +0200
Subject: [PATCH] Go to column on Flex error

---
 src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java     | 9 ++++++++-
 .../flash/gui/editor/LineMarkedEditorPane.java           | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 411382eb3..4653932f1 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -1202,11 +1202,13 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
         } catch (As3ScriptReplaceException asre) {
             StringBuilder sb = new StringBuilder();
             int firstErrorLine = As3ScriptReplaceExceptionItem.LINE_UNKNOWN;
+            int firstErrorCol = As3ScriptReplaceExceptionItem.COL_UNKNOWN;
             abc.script_info.get(oldIndex).delete(abc, false);
 
             for (As3ScriptReplaceExceptionItem item : asre.getExceptionItems()) {
                 if (firstErrorLine == As3ScriptReplaceExceptionItem.LINE_UNKNOWN) {
                     firstErrorLine = item.getLine();
+                    firstErrorCol = item.getCol();
                 }
                 sb.append(item.getFile()).append(":").append(item.getLine()).append(" (column ").append(item.getCol()).append(")").append(":").append("\n");
                 sb.append("  ").append(item.getMessage());
@@ -1214,11 +1216,16 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
                 sb.append("\n");
             }
             if (firstErrorLine != As3ScriptReplaceExceptionItem.LINE_UNKNOWN) {
-                decompiledTextArea.gotoLine((int) firstErrorLine);
+                if (firstErrorCol != As3ScriptReplaceExceptionItem.COL_UNKNOWN) {
+                    decompiledTextArea.gotoLineCol(firstErrorLine, firstErrorCol);
+                } else {
+                    decompiledTextArea.gotoLine(firstErrorLine);
+                }
                 decompiledTextArea.markError();
             }
             //View.showMessageDialog(this, AppStrings.translate("error.action.save").replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
             View.showMessageDialog(this, sb.toString(), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
+            decompiledTextArea.requestFocus();
         } catch (Throwable ex) {
             Logger.getLogger(ABCPanel.class.getName()).log(Level.SEVERE, null, ex);
         }
diff --git a/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
index aab919ccc..90b135d66 100644
--- a/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
+++ b/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
@@ -218,6 +218,10 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
         setCaretPosition(ActionUtils.getDocumentPosition(this, line, 0));
     }
 
+    public void gotoLineCol(int line, int column) {
+        setCaretPosition(ActionUtils.getDocumentPosition(this, line, column));
+    }
+
     public Point getLineLocation(int line) {
         int pos = ActionUtils.getDocumentPosition(this, line + 1, 0);
         if (pos < 0) {