add/remove breakpoints

src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java

@@ -21,19 +21,23 @@ import com.jpexs.debugger.flash.DebugMessageListener;
 import com.jpexs.debugger.flash.Debugger;
 import com.jpexs.debugger.flash.DebuggerCommands;
 import com.jpexs.debugger.flash.DebuggerConnection;
-import com.jpexs.debugger.flash.InDebuggerMessage;
 import com.jpexs.debugger.flash.messages.in.InAskBreakpoints;
 import com.jpexs.debugger.flash.messages.in.InBreakAt;
 import com.jpexs.debugger.flash.messages.in.InContinue;
 import com.jpexs.debugger.flash.messages.in.InNumScript;
 import com.jpexs.debugger.flash.messages.in.InScript;
+import com.jpexs.debugger.flash.messages.in.InSetBreakpoint;
 import com.jpexs.debugger.flash.messages.in.InSwfInfo;
 import com.jpexs.decompiler.flash.abc.ClassPath;
+import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.graph.DottedChain;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -48,6 +52,15 @@ public class DebuggerHandler implements DebugConnectionListener {
     private DebuggerCommands commands = null;
     private List<InSwfInfo.SwfInfo> swfs = new ArrayList<>();
     private boolean paused = true;
+    private Map<Integer, ClassPath> modulePaths = new HashMap<>();
+    private Map<ClassPath, Integer> classToModule = new HashMap<>();
+
+    public int moduleIdOf(ScriptPack pack) {
+        if (classToModule.containsKey(pack.getClassPath())) {
+            return classToModule.get(pack.getClassPath());
+        }
+        return -1;
+    }
 
     public synchronized boolean isPaused() {
         return paused;
@@ -57,11 +70,22 @@ public class DebuggerHandler implements DebugConnectionListener {
         return swfs;
     }
 
+    public void disconnect() {
+        connected = false;
+        if (commands != null) {
+            commands.disconnect();
+        }
+        commands = null;
+    }
+
     public boolean isConnected() {
         return connected;
     }
 
-    public DebuggerCommands getCommands() {
+    public DebuggerCommands getCommands() throws IOException {
+        if (!isConnected() || commands == null) {
+            throw new IOException("Not connected");
+        }
         return commands;
     }
 
@@ -84,66 +108,89 @@ public class DebuggerHandler implements DebugConnectionListener {
         //rootLog.getHandlers()[0].setLevel(level);
 
         commands = new DebuggerCommands(con);
-        commands.stopWarning();
-        commands.setStopOnFault();
-        commands.setEnumerateOverride();
-        commands.setNotifyFailure();
-        commands.setInvokeSetters();
-        commands.setSwfLoadNotify();
-        commands.setGetterTimeout(1500);
-        commands.setSetterTimeout(5000);
-        commands.squelch(true);
-        swfs = commands.getSwfInfo(1);
-        int numScript = con.getMessage(InNumScript.class).num;
-        final Map<Integer, String> moduleNames = new HashMap<>();
-        for (int i = 0; i < numScript; i++) {
-            InScript sc = con.getMessage(InScript.class);
-            System.out.println("" + sc.module + ":" + sc.name);
-            moduleNames.put(sc.module, sc.name);
+        try {
+            commands.stopWarning();
+            commands.setStopOnFault();
+            commands.setEnumerateOverride();
+            commands.setNotifyFailure();
+            commands.setInvokeSetters();
+            commands.setSwfLoadNotify();
+            commands.setGetterTimeout(1500);
+            commands.setSetterTimeout(5000);
+            commands.squelch(true);
+            swfs = commands.getSwfInfo(1);
+
+            Map<Integer, String> moduleNames = new HashMap<>();
+
+            modulePaths = new HashMap<>();
+            classToModule = new HashMap<>();
+
+            int numScript = con.getMessage(InNumScript.class).num;
+            for (int i = 0; i < numScript; i++) {
+                InScript sc = con.getMessage(InScript.class);
+                moduleNames.put(sc.module, sc.name);
+            }
+
+            for (int mname : moduleNames.keySet()) {
+                String name = moduleNames.get(mname);
+                String[] parts = name.split(";");
+
+                if (parts.length == 3) {
+                    String clsName = parts[2].replace(".as", "");
+                    String pkg = parts[1].replace("/", "\\").replace("\\", ".");
+                    ClassPath cp = new ClassPath(DottedChain.parse(pkg), clsName);
+                    modulePaths.put(mname, cp);
+                    classToModule.put(cp, mname);
+                }
+            }
+
+            con.getMessage(InSetBreakpoint.class);
+            con.getMessage(InAskBreakpoints.class);
+            con.addMessageListener(new DebugMessageListener<InContinue>() {
+
+                @Override
+                public void message(InContinue msg) {
+                    synchronized (DebuggerHandler.this) {
+                        paused = false;
+                    }
+                    Main.getMainFrame().getPanel().updateMenu();
+                }
+            });
+            con.addMessageListener(new DebugMessageListener<InBreakAt>() {
+
+                @Override
+                public void message(InBreakAt message) {
+                    synchronized (DebuggerHandler.this) {
+                        paused = true;
+                    }
+                    Main.getMainFrame().getPanel().updateMenu();
+                    Logger.getLogger(DebuggerHandler.class.getName()).log(Level.INFO, "break at {0}:{1}", new Object[]{moduleNames.get(message.file), message.line});
+                    if (!modulePaths.containsKey(message.file)) {
+                        return;
+                    }
+                    String cls = modulePaths.get(message.file).toString();
+                    Main.getMainFrame().getPanel().debuggerBreakAt(Main.getMainFrame().getPanel().getCurrentSwf(), cls, message.line);
+                    //dc.sendContinue();
+                }
+            });
+            //commands.sendContinue();
+            List<ScriptPack> packs = Main.getMainFrame().getPanel().getCurrentSwf().getAS3Packs();
+            for (ScriptPack sp : packs) {
+                ClassPath cp = sp.getClassPath();
+                if (classToModule.containsKey(cp)) {
+                    int file = classToModule.get(cp);
+                    Set<Integer> bpts = new TreeSet<>(Main.getPackBreakPoints(sp));
+                    for (int line : bpts) {
+                        if (!commands.addBreakPoint(file, line)) {
+                            Main.markBreakPointInvalid(sp, line);
+                        }
+                    }
+                }
+            }
+            Main.getMainFrame().getPanel().refreshBreakPoints();
+            connected = true;
+        } catch (IOException ex) {
+            connected = false;
         }
-
-        final Map<Integer, ClassPath> modulePaths = new HashMap<>();
-
-        for (int mname : moduleNames.keySet()) {
-            String name = moduleNames.get(mname);
-            String[] parts = name.split(";");
-
-            if (parts.length == 3) {
-                String clsName = parts[2].replace(".as", "");
-                String pkg = parts[1].replace("/", "\\").replace("\\", ".");
-                modulePaths.put(mname, new ClassPath(DottedChain.parse(pkg), clsName));
-            }
-        }
-
-        con.getMessage(InAskBreakpoints.class);
-        con.addMessageListener(new DebugMessageListener<InContinue>() {
-
-            @Override
-            public void message(InContinue msg) {
-                synchronized (DebuggerHandler.this) {
-                    paused = false;
-                }
-                Main.getMainFrame().getPanel().updateMenu();
-            }
-        });
-        con.addMessageListener(new DebugMessageListener<InBreakAt>() {
-
-            @Override
-            public void message(InBreakAt message) {
-                synchronized (DebuggerHandler.this) {
-                    paused = true;
-                }
-                Main.getMainFrame().getPanel().updateMenu();
-                Logger.getLogger(DebuggerHandler.class.getName()).log(Level.INFO, "break at {0}:{1}", new Object[]{moduleNames.get(message.file), message.line});
-                if (!modulePaths.containsKey(message.file)) {
-                    return;
-                }
-                String cls = modulePaths.get(message.file).toString();
-                Main.getMainFrame().getPanel().debuggerBreakAt(Main.getMainFrame().getPanel().getCurrentSwf(), cls, message.line);
-                //dc.sendContinue();
-            }
-        });
-        //commands.sendContinue();
-        connected = true;
     }
 }

src/com/jpexs/decompiler/flash/gui/Main.java

@@ -34,6 +34,7 @@ import com.jpexs.decompiler.flash.SWFSourceInfo;
 import com.jpexs.decompiler.flash.SearchMode;
 import com.jpexs.decompiler.flash.SwfOpenException;
 import com.jpexs.decompiler.flash.Version;
+import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.configuration.SwfSpecificConfiguration;
@@ -90,10 +91,14 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.WeakHashMap;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.ConsoleHandler;
@@ -153,6 +158,91 @@ public class Main {
 
     private static DebuggerHandler debugHandler = null;
 
+    private static Map<ScriptPack, Set<Integer>> breakPointMap = new WeakHashMap<>();
+    private static Map<ScriptPack, Set<Integer>> invalidBreakPointMap = new WeakHashMap<>();
+
+    public static void clearBreakPoints(ScriptPack pack) {
+        if (breakPointMap.containsKey(pack)) {
+            breakPointMap.remove(pack);
+        }
+    }
+
+    public static boolean isBreakPointValid(ScriptPack pack, int line) {
+        if (!invalidBreakPointMap.containsKey(pack)) {
+            return true;
+        }
+        return !invalidBreakPointMap.get(pack).contains(line);
+
+    }
+
+    public static void markBreakPointInvalid(ScriptPack pack, int line) {
+        if (!invalidBreakPointMap.containsKey(pack)) {
+            invalidBreakPointMap.put(pack, new TreeSet<>());
+        }
+        invalidBreakPointMap.get(pack).add(line);
+    }
+
+    public static void addBreakPoint(ScriptPack pack, int line) {
+        if (!breakPointMap.containsKey(pack)) {
+            breakPointMap.put(pack, new TreeSet<>());
+        }
+        breakPointMap.get(pack).add(line);
+        if (debugHandler.isConnected()) {
+            int file = debugHandler.moduleIdOf(pack);
+            if (file > -1) {
+                try {
+                    if (!debugHandler.getCommands().addBreakPoint(file, line)) {
+                        markBreakPointInvalid(pack, line);
+                    }
+                } catch (IOException ex) {
+                    debugHandler.disconnect();
+                    //ignore
+                }
+            }
+        }
+    }
+
+    public static void removeBreakPoint(ScriptPack pack, int line) {
+        if (breakPointMap.containsKey(pack)) {
+            Set<Integer> lines = breakPointMap.get(pack);
+            if (lines != null) {
+                lines.remove(line);
+            }
+        }
+        if (debugHandler.isConnected()) {
+            int file = debugHandler.moduleIdOf(pack);
+            if (file > -1) {
+                try {
+                    debugHandler.getCommands().removeBreakPoint(file, line);
+                } catch (IOException ex) {
+                    debugHandler.disconnect();
+                    //ignore
+                }
+            }
+        }
+    }
+
+    public static boolean toggleBreakPoint(ScriptPack pack, int line) {
+        if (!breakPointMap.containsKey(pack)) {
+            addBreakPoint(pack, line);
+            return true;
+        }
+        if (breakPointMap.get(pack).contains(line)) {
+            removeBreakPoint(pack, line);
+            return false;
+        } else {
+            addBreakPoint(pack, line);
+            return true;
+        }
+    }
+
+    public static Set<Integer> getPackBreakPoints(ScriptPack pack) {
+        if (!breakPointMap.containsKey(pack)) {
+            return new HashSet<>();
+        }
+        return breakPointMap.get(pack);
+    }
+
     public static DebuggerHandler getDebugHandler() {
         return debugHandler;
     }
@@ -1465,7 +1555,7 @@ public class Main {
             String proxyAddress = Configuration.updateProxyAddress.get();
             URL url = new URL(ApplicationInfo.updateCheckUrl);
 
-            URLConnection uc = null;
+            URLConnection uc;
             if (proxyAddress != null && !proxyAddress.isEmpty()) {
                 int port = 8080;
                 if (proxyAddress.contains(":")) {

src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java

@@ -1097,6 +1097,9 @@ public abstract class MainFrameMenu implements MenuBuilder {
         }
         runProcess = null;
         mainFrame.getPanel().clearDebuggerColors();
+        if (runProcessDebug) {
+            Main.getDebugHandler().disconnect();
+        }
     }
 
     private void runPlayer(String exePath, String file, String flashVars) {
@@ -1124,8 +1127,7 @@ public abstract class MainFrameMenu implements MenuBuilder {
                     proc.waitFor();
 
                 } catch (InterruptedException ex) {
-                    Logger.getLogger(MainFrameMenu.class
-                            .getName()).log(Level.SEVERE, null, ex);
+                    //ignore
                 }
                 freeRun();
                 updateComponents();
@@ -1232,46 +1234,67 @@ public abstract class MainFrameMenu implements MenuBuilder {
     }
 
     public boolean pauseActionPerformed(ActionEvent evt) {
-        DebuggerCommands cmd = Main.getDebugHandler().getCommands();
-        if (cmd != null) {
+        try {
+            DebuggerCommands cmd = Main.getDebugHandler().getCommands();
             //TODO
+
+        } catch (IOException ex) {
+            Main.getDebugHandler().disconnect();
+            //ignore
         }
         return true;
     }
 
     public boolean stepOverActionPerformed(ActionEvent evt) {
-        DebuggerCommands cmd = Main.getDebugHandler().getCommands();
-        if (cmd != null) {
+        try {
+
+            DebuggerCommands cmd = Main.getDebugHandler().getCommands();
             mainFrame.getPanel().clearDebuggerColors();
             cmd.stepOver();
+        } catch (IOException ex) {
+            Main.getDebugHandler().disconnect();
+            //ignore
         }
         return true;
     }
 
     public boolean stepIntoActionPerformed(ActionEvent evt) {
-        DebuggerCommands cmd = Main.getDebugHandler().getCommands();
-        if (cmd != null) {
+        try {
+            DebuggerCommands cmd = Main.getDebugHandler().getCommands();
             mainFrame.getPanel().clearDebuggerColors();
             cmd.stepInto();
+        } catch (IOException ex) {
+            Main.getDebugHandler().disconnect();
+            //ignore
         }
+
         return true;
     }
 
     public boolean stepOutActionPerformed(ActionEvent evt) {
-        DebuggerCommands cmd = Main.getDebugHandler().getCommands();
-        if (cmd != null) {
+        try {
+            DebuggerCommands cmd = Main.getDebugHandler().getCommands();
             mainFrame.getPanel().clearDebuggerColors();
+
             cmd.stepOut();
+        } catch (IOException ex) {
+            Main.getDebugHandler().disconnect();
+            //ignore
         }
+
         return true;
     }
 
     public boolean continueActionPerformed(ActionEvent evt) {
-        DebuggerCommands cmd = Main.getDebugHandler().getCommands();
-        if (cmd != null) {
+        try {
+            DebuggerCommands cmd = Main.getDebugHandler().getCommands();
             mainFrame.getPanel().clearDebuggerColors();
             cmd.sendContinue();
+        } catch (IOException ex) {
+            Main.getDebugHandler().disconnect();
+            //ignore
         }
+
         return true;
     }
 

src/com/jpexs/decompiler/flash/gui/MainPanel.java

@@ -84,6 +84,7 @@ import com.jpexs.decompiler.flash.gui.controls.JPersistentSplitPane;
 import com.jpexs.decompiler.flash.gui.dumpview.DumpTree;
 import com.jpexs.decompiler.flash.gui.dumpview.DumpTreeModel;
 import com.jpexs.decompiler.flash.gui.dumpview.DumpViewPanel;
+import com.jpexs.decompiler.flash.gui.editor.LineMarkedEditorPane;
 import com.jpexs.decompiler.flash.gui.helpers.ObservableList;
 import com.jpexs.decompiler.flash.gui.player.FlashPlayerPanel;
 import com.jpexs.decompiler.flash.gui.tagtree.TagTree;
@@ -1539,10 +1540,16 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
     }
 
+    public void refreshBreakPoints() {
+        if (abcPanel != null) {
+            abcPanel.decompiledTextArea.refreshBreakPoints();
+        }
+    }
+
     public void debuggerBreakAt(SWF swf, String cls, int line) {
         gotoClassLine(swf, cls, line);
         if (abcPanel != null) {
-            abcPanel.decompiledTextArea.setLineColor(line - 1, Color.green);
+            abcPanel.decompiledTextArea.addColorMarker(line, DecompiledEditorPane.FG_IP_COLOR, DecompiledEditorPane.BG_IP_COLOR);
         }
     }
 
@@ -2806,7 +2813,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
     public void clearDebuggerColors() {
         if (abcPanel != null) {
-            abcPanel.decompiledTextArea.clearLineColors();
+            abcPanel.decompiledTextArea.removeColorMarkerOnAllLines(DecompiledEditorPane.FG_IP_COLOR, DecompiledEditorPane.BG_IP_COLOR);
         }
     }
 

src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java

@@ -35,6 +35,7 @@ import com.jpexs.decompiler.flash.abc.types.traits.TraitFunction;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
 import com.jpexs.decompiler.flash.gui.AppStrings;
+import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.gui.editor.LineMarkedEditorPane;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
@@ -43,18 +44,22 @@ import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
 import com.jpexs.decompiler.flash.helpers.hilight.Highlighting;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.graph.DottedChain;
+import java.awt.Color;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
+import jsyntaxpane.DefaultSyntaxKit;
 import jsyntaxpane.SyntaxDocument;
 import jsyntaxpane.Token;
 import jsyntaxpane.TokenType;
+import jsyntaxpane.components.BreakPointListener;
 
-public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretListener {
+public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretListener, BreakPointListener {
 
     private List<Highlighting> highlights = new ArrayList<>();
 
@@ -86,6 +91,31 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
 
     private final List<Runnable> scriptListeners = new ArrayList<>();
 
+    public static final Color BG_BREAKPOINT_COLOR = new Color(0xfc, 0x9d, 0x9f);
+    public static final Color FG_BREAKPOINT_COLOR = null;
+
+    public static final Color BG_IP_COLOR = new Color(0xbd, 0xe6, 0xaa);
+    public static final Color FG_IP_COLOR = null;
+
+    public static final Color BG_INVALID_BREAKPOINT_COLOR = new Color(0xdc, 0xdc, 0xd8);
+    public static final Color FG_INVALID_BREAKPOINT_COLOR = null;
+
+    @Override
+    public void toggled(int line) {
+        boolean on = Main.toggleBreakPoint(script, line);
+        removeColorMarker(line, FG_INVALID_BREAKPOINT_COLOR, BG_INVALID_BREAKPOINT_COLOR);
+        if (on) {
+            if (Main.isBreakPointValid(script, line)) {
+                addColorMarker(line, FG_BREAKPOINT_COLOR, BG_BREAKPOINT_COLOR);
+            } else {
+                addColorMarker(line, FG_INVALID_BREAKPOINT_COLOR, BG_INVALID_BREAKPOINT_COLOR);
+            }
+        } else {
+            removeColorMarker(line, FG_BREAKPOINT_COLOR, BG_BREAKPOINT_COLOR);
+            removeColorMarker(line, FG_INVALID_BREAKPOINT_COLOR, BG_INVALID_BREAKPOINT_COLOR);
+        }
+    }
+
     public void addScriptListener(Runnable l) {
         scriptListeners.add(l);
     }
@@ -573,7 +603,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
                     }
                 }
                 currentMethodHighlight = null;
-                currentTrait = null;
+                //currentTrait = null;
                 String name = abc.instance_info.get(classIndex).getName(abc.constants).getNameWithNamespace(abc.constants).toPrintableString(true);
                 currentTrait = getCurrentTrait();
                 isStatic = abc.isStaticTraitId(classIndex, lastTraitIndex);
@@ -599,8 +629,8 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
 
         Highlighting tc = Highlighting.searchIndex(classHighlights, classIndex);
         if (tc != null || isScriptInit) {
-            Highlighting th = Highlighting.searchIndex(traitHighlights, traitId, isScriptInit ? 0 : tc.startPos, isScriptInit ? -1 : tc.startPos + tc.len);
-            int pos;
+            Highlighting th = Highlighting.searchIndex(traitHighlights, traitId, isScriptInit || tc == null ? 0 : tc.startPos, isScriptInit || tc == null ? -1 : tc.startPos + tc.len);
+            int pos = 0;
             if (th != null) {
                 if (th.len > 1) {
                     ignoreCarret = true;
@@ -611,7 +641,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
                     ignoreCarret = false;
                 }
                 pos = th.startPos;
-            } else {
+            } else if (tc != null) {
                 pos = tc.startPos;
             }
 
@@ -705,9 +735,25 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
         return script == null ? null : script.abc;
     }
 
+    public void refreshBreakPoints() {
+        Set<Integer> bkptLines = Main.getPackBreakPoints(script);
+        removeColorMarkerOnAllLines(FG_BREAKPOINT_COLOR, BG_BREAKPOINT_COLOR);
+        removeColorMarkerOnAllLines(FG_INVALID_BREAKPOINT_COLOR, BG_INVALID_BREAKPOINT_COLOR);
+
+        for (int line : bkptLines) {
+            if (Main.isBreakPointValid(script, line)) {
+                addColorMarker(line, FG_BREAKPOINT_COLOR, BG_BREAKPOINT_COLOR);
+            } else {
+                addColorMarker(line, FG_INVALID_BREAKPOINT_COLOR, BG_INVALID_BREAKPOINT_COLOR);
+            }
+        }
+    }
+
     @Override
     public void setText(String t) {
         super.setText(t);
         setCaretPosition(0);
+        refreshBreakPoints();
+
     }
 }

src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java

@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui.editor;
 
+import com.jpexs.decompiler.flash.abc.avm2.parser.script.Reference;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.gui.AppStrings;
 import java.awt.Color;
@@ -32,8 +33,11 @@ import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.plaf.TextUI;
@@ -44,10 +48,17 @@ import javax.swing.text.Element;
 import javax.swing.text.Highlighter.HighlightPainter;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.Position;
+import javax.swing.text.Segment;
+import javax.swing.text.TabExpander;
 import javax.swing.text.View;
+import jsyntaxpane.DefaultSyntaxKit;
 import jsyntaxpane.SyntaxDocument;
+import jsyntaxpane.SyntaxStyle;
 import jsyntaxpane.Token;
 import jsyntaxpane.actions.ActionUtils;
+import jsyntaxpane.components.BreakPointListener;
+import jsyntaxpane.components.LineNumbersRuler;
+import jsyntaxpane.components.Markers;
 
 /**
  *
@@ -57,6 +68,9 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
 
     private static final int truncateLimit = 2 * 1024 * 1024;
 
+    public static final Color BG_SELECTED_LINE = new Color(0xe9, 0xef, 0xf8);
+    public static final Color BG_ERROR_LINE = new Color(255, 200, 200);
+
     private int lastLine = -1;
 
     private boolean error = false;
@@ -67,17 +81,109 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
 
     private LinkHandler linkHandler = this;
 
-    private Map<Integer, Color> lineColors = new HashMap<>();
+    public static class LineMarker {
+
+        private Color bgColor;
+        private Color color;
+        private FgPainter fgPainter;
+        private int line;
+
+        public FgPainter getForegroundPainter() {
+            return fgPainter;
+        }
+
+        public LineMarker(int line, Color color, Color bgColor) {
+            this.line = line;
+            this.bgColor = bgColor;
+            this.color = color;
+            if (color != null) {
+                this.fgPainter = new FgPainter(color, bgColor);
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            int hash = 5;
+            hash = 17 * hash + Objects.hashCode(this.bgColor);
+            hash = 17 * hash + Objects.hashCode(this.color);
+            hash = 17 * hash + this.line;
+            return hash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == null) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            final LineMarker other = (LineMarker) obj;
+            if (!Objects.equals(this.bgColor, other.bgColor)) {
+                return false;
+            }
+            if (!Objects.equals(this.color, other.color)) {
+                return false;
+            }
+            return this.line == other.line;
+        }
+
+        public Color getBgColor() {
+            return bgColor;
+        }
+
+        public Color getColor() {
+            return color;
+        }
+
+    }
+
+    private Map<Integer, List<LineMarker>> lineMarkers = new HashMap<>();
+
+    public void setLineMarkers(Map<Integer, List<LineMarker>> colorMarkers) {
+        this.lineMarkers = colorMarkers;
+    }
 
     public void clearLineColors() {
-        lineColors.clear();
+        lineMarkers.clear();
         repaint();
     }
 
-    public void setLineColor(int line, Color color) {
-        lineColors.remove(line);
-        if (color != null) {
-            lineColors.put(line, color);
+    public void removeColorMarker(int line, Color color, Color bgColor) {
+        if (lineMarkers.containsKey(line)) {
+            LineMarker lm = new LineMarker(line, color, bgColor);
+            lineMarkers.get(line).remove(lm);
+        }
+        repaint();
+    }
+
+    public void removeColorMarkerOnAllLines(Color color, Color bgColor) {
+        for (int line : lineMarkers.keySet()) {
+            removeColorMarker(line, color, bgColor);
+        }
+    }
+
+    public void toggleColorMarker(int line, Color color, Color bgColor) {
+        if (!lineMarkers.containsKey(line)) {
+            addColorMarker(line, color, bgColor);
+        } else {
+            if (lineMarkers.get(line).contains(color)) {
+                removeColorMarker(line, color, bgColor);
+            } else {
+                addColorMarker(line, color, bgColor);
+            }
+        }
+        repaint();
+    }
+
+    public void addColorMarker(int line, Color color, Color bgColor) {
+        if (!lineMarkers.containsKey(line)) {
+            lineMarkers.put(line, new ArrayList<>());
+
+        }
+        LineMarker marker = new LineMarker(line, color, bgColor);
+        if (!lineMarkers.get(line).contains(marker)) {
+            lineMarkers.get(line).add(marker);
         }
         repaint();
     }
@@ -94,7 +200,7 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
         setCaretPosition(ActionUtils.getDocumentPosition(this, line, 0));
     }
 
-    public void selectLine(int line) {
+    private void getLineBounds(int line, Reference<Integer> lineStart, Reference<Integer> lineEnd) {
         Document d = getDocument();
         String text = "";
         try {
@@ -103,27 +209,35 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
             //ignore
         }
         int lineCnt = 1;
-        int lineStart = 0;
-        int lineEnd = -1;
+        int lineStartVal = 0;
+        int lineEndVal = -1;
         for (int i = 0; i < text.length(); i++) {
             if (text.charAt(i) == '\n') {
                 lineCnt++;
                 if (lineCnt == line) {
-                    lineStart = i + 1;
+                    lineStartVal = i + 1;
                 }
                 if (lineCnt == line + 1) {
-                    lineEnd = i;
+                    lineEndVal = i;
                 }
             }
         }
         if (lineCnt == 1) {
-            lineEnd = text.length() - 1;
+            lineEndVal = text.length() - 1;
             if (line > 1) {
-                lineStart = text.length() - 1;
+                lineStartVal = text.length() - 1;
             }
         }
+        lineEnd.setVal(lineEndVal);
+        lineStart.setVal(lineStartVal);
+    }
 
-        select(lineStart, lineEnd);
+    public void selectLine(int line) {
+        Reference<Integer> lineStart = new Reference<>(0);
+        Reference<Integer> lineEnd = new Reference<>(0);
+        getLineBounds(line, lineStart, lineEnd);
+
+        select(lineStart.getVal(), lineEnd.getVal());
         requestFocus();
     }
 
@@ -287,15 +401,101 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
 
     }
 
+    public void setText(String t, Map<Integer, List<LineMarker>> lineMarkers) {
+        setText(t);
+        this.lineMarkers = lineMarkers;
+        repaint();
+    }
+
     @Override
     public void setText(String t) {
+        this.lineMarkers = new HashMap<>();
         lastLine = -1;
         error = false;
         if (Configuration.debugMode.get() && t != null && t.length() > truncateLimit) {
             t = t.substring(0, truncateLimit) + "\r\n" + AppStrings.translate("editorTruncateWarning").replace("%chars%", Integer.toString(truncateLimit));
         }
         super.setText(t);
-        setCaretPosition(0); //scroll to top
+        setCaretPosition(0); //scroll to top            
+    }
+
+    public static class FgPainter extends DefaultHighlighter.DefaultHighlightPainter {
+
+        private SyntaxStyle fgStyle;
+
+        public FgPainter(Color color, Color bgColor) {
+            super(bgColor);
+            this.fgStyle = new SyntaxStyle(color, false, false);
+        }
+
+        @Override
+        public void paint(Graphics g, int offs0, int offs1, Shape bounds, JTextComponent c) {
+            try {
+                // --- determine locations ---
+                TextUI mapper = c.getUI();
+
+                Segment seg = new Segment();
+                ((SyntaxDocument) c.getDocument()).getText(offs0, offs1 - offs0, seg);
+
+                Rectangle r = mapper.modelToView(c, offs0, Position.Bias.Forward);
+                FontMetrics fm = g.getFontMetrics();
+                //int fh = fm.getHeight();
+                fgStyle.drawText(seg, r.x, r.y + fm.getAscent(), g, null, offs0);
+                /*for (int i = offs0; i < offs1; i++) {
+
+                 Rectangle r = mapper.modelToView(c, i, Position.Bias.Forward);
+                 Rectangle r1 = mapper.modelToView(c, i + 1, Position.Bias.Forward);
+                 if (r1.y == r.y) {
+                 ((SyntaxDocument) c.getDocument()).getText(i, 1, seg);
+                 fgStyle.drawText(seg, r.x, r.y, g, null, i);
+                 //g.drawLine(r.x, r.y + r.height - 3, r1.x, r.y + r.height - 3);
+                 }
+                 }*/
+
+            } catch (BadLocationException e) {
+                // can't render
+            }
+        }
+
+        @Override
+        public Shape paintLayer(Graphics g, int offs0, int offs1,
+                Shape bounds, JTextComponent c, View view) {
+
+            g.setColor(c.getSelectionColor());
+
+            Rectangle r;
+
+            if (offs0 == view.getStartOffset()
+                    && offs1 == view.getEndOffset()) {
+                // Contained in view, can just use bounds.
+                if (bounds instanceof Rectangle) {
+                    r = (Rectangle) bounds;
+                } else {
+                    r = bounds.getBounds();
+                }
+            } else {
+                // Should only render part of View.
+                try {
+                    // --- determine locations ---
+                    Shape shape = view.modelToView(offs0, Position.Bias.Forward,
+                            offs1, Position.Bias.Backward,
+                            bounds);
+                    r = (shape instanceof Rectangle)
+                            ? (Rectangle) shape : shape.getBounds();
+                } catch (BadLocationException e) {
+                    // can't render
+                    r = null;
+                }
+            }
+
+            if (r != null) {
+                r.width = Math.max(r.width, 1);
+
+                paint(g, offs0, offs1, r, c);
+            }
+
+            return r;
+        }
     }
 
     public static class UnderLinePainter extends DefaultHighlighter.DefaultHighlightPainter {
@@ -381,16 +581,38 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
 
         if (lastLine > 0) {
             if (error) {
-                g.setColor(new Color(255, 200, 200));
+                g.setColor(BG_ERROR_LINE);
             } else {
-                g.setColor(new Color(0xee, 0xee, 0xee));
+                g.setColor(BG_SELECTED_LINE);
             }
             g.fillRect(0, d + lh * lastLine - 1, getWidth(), lh);
         }
-        for (int line : lineColors.keySet()) {
-            g.setColor(lineColors.get(line));
-            g.fillRect(0, d + lh * line - 1, getWidth(), lh);
+        for (int line : lineMarkers.keySet()) {
+            List<LineMarker> cs = lineMarkers.get(line);
+            if (cs.isEmpty()) {
+                continue;
+            }
+            LineMarker lastMarker = cs.get(cs.size() - 1);
+            if (lastMarker.getBgColor() == null) {
+                continue;
+            }
+            g.setColor(lastMarker.getBgColor());
+            g.fillRect(0, d + lh * (line - 1), getWidth(), lh);
         }
         super.paint(g);
+        for (int line : lineMarkers.keySet()) {
+            List<LineMarker> cs = lineMarkers.get(line);
+            if (cs.isEmpty()) {
+                continue;
+            }
+            Reference<Integer> lineStart = new Reference<>(0);
+            Reference<Integer> lineEnd = new Reference<>(0);
+            getLineBounds(line, lineStart, lineEnd);
+            FgPainter fgp = cs.get(cs.size() - 1).getForegroundPainter();
+            if (fgp != null) {
+                fgp.paint(g, lineStart.getVal(), lineEnd.getVal(), null, this);
+            }
+        }
     }
+
 }