Package update:

Added: Conditional breakpoints.
Added: Option for disabling/enabling breakpoints by double-clicking on status icon before line number in Xdebug Breakpoint window.

Author: martomo

Context.sublime-menu

@@ -8,6 +8,10 @@
                 "caption": "Add/Remove Breakpoint",
                 "command": "xdebug_breakpoint"
             },
+            {
+                "caption": "Set Conditional Breakpoint",
+                "command": "xdebug_conditional_breakpoint"
+            },
             {
                 "caption": "Clear All Breakpoints",
                 "command": "xdebug_clear_breakpoints"

Default.sublime-commands

@@ -26,6 +26,10 @@
         "caption": "Xdebug: Add/Remove Breakpoint",
         "command": "xdebug_breakpoint"
     },
+    {
+        "caption": "Xdebug: Set Conditional Breakpoint",
+        "command": "xdebug_conditional_breakpoint"
+    },
     {
         "caption": "Xdebug: Clear All Breakpoints",
         "command": "xdebug_clear_breakpoints"

Default.sublime-keymap

@@ -1,5 +1,6 @@
 [
 	{"keys": ["ctrl+f8"], "command": "xdebug_breakpoint"},
+	{"keys": ["ctrl+f9"], "command": "xdebug_conditional_breakpoint"},
 	{"keys": ["ctrl+shift+f5"], "command": "xdebug_continue", "args": {"command": "run"}},
 	{"keys": ["ctrl+shift+f6"], "command": "xdebug_continue", "args": {"command": "step_over"}},
 	{"keys": ["ctrl+shift+f7"], "command": "xdebug_continue", "args": {"command": "step_into"}},

Main.sublime-menu

@@ -38,6 +38,10 @@
                         "caption": "Add/Remove Breakpoint",
                         "command": "xdebug_breakpoint"
                     },
+                    {
+                        "caption": "Set Conditional Breakpoint",
+                        "command": "xdebug_conditional_breakpoint"
+                    },
                     {
                         "caption": "Clear All Breakpoints",
                         "command": "xdebug_clear_breakpoints"

main.py

@@ -50,20 +50,21 @@ def on_selection_modified(self, view):
         # Show details in output panel of selected variable in context window
         if view.name() == V.TITLE_WINDOW_CONTEXT:
             V.show_context_output(view)
+        elif view.name() == V.TITLE_WINDOW_BREAKPOINT:
+            V.toggle_breakpoint(view)
         else:
             pass
 
 
 class XdebugBreakpointCommand(sublime_plugin.TextCommand):
     """
     Add/Remove breakpoint(s) for rows (line numbers) in selection.
-
-    TODO: By argument setting expression for conditional breakpoint
     """
-    def run(self, edit, rows=None, expression=None):
+    def run(self, edit, rows=None, condition=None, enabled=None, filename=None):
         # Get filename in current view and check if is a valid filename
-        filename = self.view.file_name()
-        if not filename:
+        if filename is None:
+            filename = self.view.file_name()
+        if not filename or not os.path.isfile(filename):
             return
 
         # Add entry for file in breakpoint data
@@ -76,40 +77,76 @@ def run(self, edit, rows=None, expression=None):
 
         # Loop through rows
         for row in rows:
-            # Add breakpoint
-            if row not in S.BREAKPOINT[filename]:
-                S.BREAKPOINT[filename][row] = { 'id': None, 'enabled': True, 'expression': expression }
-                if session.is_connected():
+            expression = None
+            if condition is not None and len(condition.strip()) > 0:
+                expression = condition
+            # Check if breakpoint exists
+            breakpoint_exists = row in S.BREAKPOINT[filename]
+            # Disable/Remove breakpoint
+            if breakpoint_exists:
+                if session.is_connected() and S.BREAKPOINT[filename][row]['id'] is not None:
                     try:
-                        S.SESSION.send(dbgp.BREAKPOINT_SET, t='line', f=util.get_real_path(filename, True), n=row)
+                        S.SESSION.send(dbgp.BREAKPOINT_REMOVE, d=S.BREAKPOINT[filename][row]['id'])
                         response = S.SESSION.read().firstChild
-                        breakpoint_id = response.getAttribute('id')
-                        if breakpoint_id:
-                            S.BREAKPOINT[filename][row]['id'] = breakpoint_id
                     except (socket.error, session.ProtocolConnectionException):
                         e = sys.exc_info()[1]
                         session.connection_error("%s" % e)
-            # Remove breakpoint
-            else:
-                if session.is_connected() and S.BREAKPOINT[filename][row]['id'] is not None:
+                if enabled is False:
+                    S.BREAKPOINT[filename][row]['enabled'] = False
+                elif enabled is None:
+                    del S.BREAKPOINT[filename][row]
+            # Add/Enable breakpoint
+            if not breakpoint_exists or enabled is True:
+                if row not in S.BREAKPOINT[filename]:
+                    S.BREAKPOINT[filename][row] = { 'id': None, 'enabled': True, 'expression': expression }
+                else:
+                    S.BREAKPOINT[filename][row]['enabled'] = True
+                    if condition is not None:
+                        S.BREAKPOINT[filename][row]['expression'] = expression
+                    else:
+                        expression = S.BREAKPOINT[filename][row]['expression']
+                if session.is_connected():
                     try:
-                        S.SESSION.send(dbgp.BREAKPOINT_REMOVE, d=S.BREAKPOINT[filename][row]['id'])
+                        S.SESSION.send(dbgp.BREAKPOINT_SET, t='line', f=util.get_real_path(filename, True), n=row, expression=expression)
                         response = S.SESSION.read().firstChild
+                        breakpoint_id = response.getAttribute('id')
+                        if breakpoint_id:
+                            S.BREAKPOINT[filename][row]['id'] = breakpoint_id
                     except (socket.error, session.ProtocolConnectionException):
                         e = sys.exc_info()[1]
                         session.connection_error("%s" % e)
-                del S.BREAKPOINT[filename][row]
 
         # Render breakpoint markers
         V.render_regions()
 
         # Update breakpoint list
-        V.show_content(V.DATA_BREAKPOINT)
+        try:
+            if sublime.active_window().get_layout() == S.LAYOUT_DEBUG:
+                V.show_content(V.DATA_BREAKPOINT)
+        except:
+            pass
 
         # Save breakpoint data to file
         util.save_breakpoint_data()
 
 
+class XdebugConditionalBreakpointCommand(sublime_plugin.TextCommand):
+    """
+    Add conditional breakpoint(s) for rows (line numbers) in selection.
+    """
+    def run(self, edit):
+        self.view.window().show_input_panel('Breakpoint condition', '', self.on_done, self.on_change, self.on_cancel)
+
+    def on_done(self, condition):
+        self.view.run_command('xdebug_breakpoint', {'condition': condition, 'enabled': True})
+
+    def on_change(self, line):
+        pass
+
+    def on_cancel(self):
+        pass
+
+
 class XdebugClearBreakpointsCommand(sublime_plugin.TextCommand):
     """
     Clear all breakpoints in selected view.

xdebug/load.py

@@ -59,13 +59,13 @@ def xdebug():
     for package in packages:
         if package.endswith(package_extension):
             package = package[:-len(package_extension)]
-        if package.lower().count("xdebug") and package != current_package:
+        if (package.lower().count("xdebug") or package.lower().count("moai")) and package != current_package:
             duplicates.append(package)
     # Show message if other Xdebug packages have been found
     if duplicates:
         info("Multiple 'xdebug' packages detected.")
         if not S.get_window_value('hide_conflict', False):
-            sublime.error_message("The following Xdebug package(s) could cause conflicts with '{package}':\n\n{other}\n\nPlease consider removing the package(s) above when experiencing any complications." \
+            sublime.error_message("The following package(s) could cause conflicts with '{package}':\n\n{other}\n\nPlease consider removing the package(s) above when experiencing any complications." \
                                     .format(package=S.PACKAGE_FOLDER, other='\n'.join(duplicates)))
             S.set_window_value('hide_conflict', True)
     else:

xdebug/settings.py

@@ -17,11 +17,13 @@
 
 REGION_KEY_BREAKPOINT = 'xdebug_breakpoint'
 REGION_KEY_CURRENT = 'xdebug_current'
-REGION_SCOPE_BREAKPOINT = 'comment'
-REGION_SCOPE_CURRENT = 'string'
+REGION_KEY_DISABLED = 'xdebug_disabled'
+REGION_SCOPE_BREAKPOINT = 'comment.line.settings'
+REGION_SCOPE_CURRENT = 'string.quoted.settings'
 
 ICON_BREAKPOINT = 'circle'
 ICON_BREAKPOINT_CURRENT = 'circle'
+ICON_BREAKPOINT_DISABLED = 'dot'
 ICON_CURRENT = 'bookmark'
 
 # Window layout for debugging output

xdebug/view.py

@@ -165,7 +165,8 @@ def show_content(data, content=None):
 
     # Set content for view and fold all indendation blocks
     view.run_command('xdebug_view_update', {'data': content, 'readonly': True})
-    view.run_command('fold_all')
+    if data == DATA_CONTEXT:
+        view.run_command('fold_all')
 
     # Restore focus to previous active view/group
     if not previous_active is None:
@@ -312,16 +313,22 @@ def render_regions(view=None):
     # Remove all markers to avoid marker conflict
     view.erase_regions(S.REGION_KEY_BREAKPOINT)
     view.erase_regions(S.REGION_KEY_CURRENT)
+    view.erase_regions(S.REGION_KEY_DISABLED)
 
     # Get filename of current view and check if is a valid filename
     filename = view.file_name()
     if not filename:
         return
 
-    # Get all breakpoint rows (line numbers) for file
-    breakpoint_rows = {}
-    if filename in S.BREAKPOINT:
-        breakpoint_rows = H.dictionary_keys(S.BREAKPOINT[filename])
+    # Get all (disabled) breakpoint rows (line numbers) for file
+    breakpoint_rows = []
+    disabled_rows = []
+    if filename in S.BREAKPOINT and isinstance(S.BREAKPOINT[filename], dict):
+        for lineno, bp in S.BREAKPOINT[filename].items():
+            if bp['enabled']:
+                breakpoint_rows.append(lineno)
+            else:
+                disabled_rows.append(lineno)
 
     # Get current line from breakpoint hit
     if S.BREAKPOINT_ROW is not None:
@@ -332,9 +339,59 @@ def render_regions(view=None):
             if S.BREAKPOINT_ROW['lineno'] in breakpoint_rows:
                 icon = S.ICON_BREAKPOINT_CURRENT
                 breakpoint_rows.remove(S.BREAKPOINT_ROW['lineno'])
+            if S.BREAKPOINT_ROW['lineno'] in disabled_rows:
+                disabled_rows.remove(S.BREAKPOINT_ROW['lineno'])
             # Set current line marker
             view.add_regions(S.REGION_KEY_CURRENT, rows_to_region(S.BREAKPOINT_ROW['lineno']), S.REGION_SCOPE_CURRENT, icon, sublime.HIDDEN)
 
     # Set breakpoint marker(s)
     if breakpoint_rows:
-        view.add_regions(S.REGION_KEY_BREAKPOINT, rows_to_region(breakpoint_rows), S.REGION_SCOPE_BREAKPOINT, S.ICON_BREAKPOINT, sublime.HIDDEN)
+        view.add_regions(S.REGION_KEY_BREAKPOINT, rows_to_region(breakpoint_rows), S.REGION_SCOPE_BREAKPOINT, S.ICON_BREAKPOINT, sublime.HIDDEN)
+    if disabled_rows:
+        view.add_regions(S.REGION_KEY_DISABLED, rows_to_region(disabled_rows), S.REGION_SCOPE_BREAKPOINT, S.ICON_BREAKPOINT_DISABLED, sublime.HIDDEN)
+
+
+def toggle_breakpoint(view):
+    try:
+        # Get selected point in view
+        point = view.sel()[0]
+        # Check if selected point uses breakpoint line scope
+        if point.size() == 3 and sublime.score_selector(view.scope_name(point.a), 'xdebug.output.breakpoint.line'):
+            # Find line number of breakpoint
+            line = view.substr(view.line(point))
+            pattern = re.compile('^\\s*(?:(\\|\\+\\|)|(\\|-\\|))\\s*(?P<line_number>\\d+)\\s*(?:(--)(.*)|.*)')
+            match = pattern.match(line)
+            # Check if it has found line number
+            if match and match.group('line_number'):
+                # Get all breakpoint filenames
+                breakpoint_file = view.find_by_selector('xdebug.output.breakpoint.file')
+                # Locate line with filename related to selected breakpoint
+                file_line = None
+                for entry in breakpoint_file:
+                    # Stop searching if we have passed selected breakpoint
+                    if entry > point:
+                        break
+                    file_line = view.substr(view.line(entry))
+                # Do not continue without line containing filename
+                if file_line is None:
+                    return
+                # Remove unnecessary text from line to get filename
+                file_pattern = re.compile('^\\s*(=>)\\s*(?P<filename>.*)')
+                file_match = file_pattern.match(file_line)
+                # Check if it is a valid filename
+                if file_match and file_match.group('filename'):
+                    filename = file_match.group('filename')
+                    line_number = match.group('line_number')
+                    enabled = None
+                    # Disable breakpoint
+                    if sublime.score_selector(view.scope_name(point.a), 'entity') and S.BREAKPOINT[filename][line_number]['enabled']:
+                        enabled = False
+                    # Enable breakpoint
+                    if sublime.score_selector(view.scope_name(point.a), 'keyword') and not S.BREAKPOINT[filename][line_number]['enabled']:
+                        enabled = True
+                    # Toggle breakpoint only if it has valid value
+                    if enabled is None:
+                        return
+                    sublime.active_window().run_command('xdebug_breakpoint', {"enabled": enabled, "rows": [line_number], "filename": filename})
+    except:
+        pass