WIP: Allow editing of breakpoint options in breakpoints window; fix winbar in neovim

Author: puremourning

autoload/vimspector.vim

@@ -173,33 +173,18 @@ function! vimspector#ClearBreakpoints() abort
   py3 _vimspector_session.ClearBreakpoints()
 endfunction
 
-let s:extended_breakpoint_properties = [
-      \ { 'prop': 'condition', 'msg': 'Enter condition expression' },
-      \ { 'prop': 'hitCondition', 'msg': 'Enter hit count expression' },
-      \ { 'prop': 'logMessage',
-      \   'msg': 'Enter log expression (to make log point)' },
-    \ ]
-
-function! s:AskForInput( ... ) abort
-  return py3eval( '__import__( "vimspector", fromlist=[ "utils" ] )'
-                \ . '.utils.AskForInput( *vim.eval( "a:000" ) )' )
+function! vimspector#ResetExceptionBreakpoints() abort
+  if !s:Enabled()
+    return
+  endif
+  py3 _vimspector_session.ResetExceptionBreakpoints()
 endfunction
 
-function! s:GetAdvancedBreakpointOptions() abort
-  let options = {}
-  for spec in s:extended_breakpoint_properties
-    let response = s:AskForInput( spec.msg . ': ' )
-    if response is s:None
-      return s:None
-    elseif response !=# ''
-      let options[ spec.prop ] = response
-    endif
-  endfor
-
-  return options
+function! s:GetAdvancedBreakpointOptions( ... ) abort
+  return py3eval( '__import__( "vimspector", fromlist=[ "breakpoints" ] )'
+                \ . '.breakpoints.GetAdvancedBreakpointOptions()' )
 endfunction
 
-
 function! vimspector#ToggleAdvancedBreakpoint() abort
   let options = s:GetAdvancedBreakpointOptions()
   if options is s:None
@@ -600,6 +585,13 @@ function! vimspector#JumpToBreakpointViewBreakpoint() abort
   py3 _vimspector_session.JumpToBreakpointViewBreakpoint()
 endfunction
 
+function! vimspector#EditBreakpointOptionsViewBreakpoint() abort
+  if !s:Enabled()
+    return
+  endif
+  py3 _vimspector_session.EditBreakpointOptionsViewBreakpoint()
+endfunction
+
 function! vimspector#JumpToNextBreakpoint() abort
   if !s:Enabled()
     return

python3/vimspector/breakpoints.py

@@ -100,27 +100,7 @@ def _UpdateView( self, breakpoint_list, show=True ):
 
       utils.SetSyntax( '', 'vimspector-breakpoints', self._buffer )
 
-      if utils.UseWinBar():
-        vim.command( 'nnoremenu <silent> 1.1 WinBar.Delete '
-                     ':call vimspector#DeleteBreakpointViewBreakpoint()<CR>' )
-        vim.command( 'nnoremenu <silent> 1.2 WinBar.Toggle '
-                     ':call vimspector#ToggleBreakpointViewBreakpoint()<CR>' )
-        vim.command( 'nnoremenu <silent> 1.2 WinBar.*Toggle '
-                     ':call'
-                       ' vimspector#ToggleAllBreakpointsViewBreakpoint()<CR>' )
-        vim.command( 'nnoremenu <silent> 1.3 WinBar.Jump\\ To '
-                     ':call vimspector#JumpToBreakpointViewBreakpoint()<CR>' )
-        # TODO: Add tests for this function
-        vim.command( 'nnoremenu <silent> 1.4 WinBar.+Line '
-                     ':call vimspector#SetAdvancedLineBreakpoint()<CR>' )
-        vim.command( 'nnoremenu <silent> 1.4 WinBar.+Function '
-                     ':call vimspector#AddAdvancedFunctionBreakpoint()<CR>' )
-        vim.command( 'nnoremenu <silent> 1.4 WinBar.Clear '
-                     ':call vimspector#ClearBreakpoints()<CR>' )
-        vim.command( 'nnoremenu <silent> 1.4 WinBar.Save '
-                     ':call vimspector#WriteSessionFile()<CR>' )
-        vim.command( 'nnoremenu <silent> 1.4 WinBar.Load '
-                     ':call vimspector#ReadSessionFile()<CR>' )
+      self._RenderWinBar()
 
       # we want to maintain the height of the window
       self._win.options[ "winfixheight" ] = True
@@ -141,6 +121,28 @@ def FormatEntry( el ):
           utils.SetBufferContents( self._buffer,
                                    list( map( FormatEntry, breakpoint_list ) ) )
 
+
+  def _RenderWinBar( self ):
+    if not utils.UseWinBar():
+      return
+
+    if not self._HasWindow():
+      return
+
+    with utils.LetCurrentWindow( self._win ):
+      utils.SetWinBar(
+        ( 'Del', 'vimspector#DeleteBreakpointViewBreakpoint()' ),
+        ( 'On/Off', 'vimspector#ToggleBreakpointViewBreakpoint()' ),
+        ( 'Edit', 'vimspector#EditBreakpointOptionsViewBreakpoint()' ),
+        ( '+Line', 'vimspector#SetAdvancedLineBreakpoint()' ),
+        ( '+Func', 'vimspector#AddAdvancedFunctionBreakpoint()' ),
+        ( 'Clr All', 'vimspector#ClearBreakpoints()' ),
+        ( 'Clr Excp', 'vimspector#ResetExceptionBreakpoints()' ),
+        ( 'Save', 'vimspector#WriteSessionFile()' ),
+        ( 'Load', 'vimspector#ReadSessionFile()' ),
+      )
+
+
   def CloseBreakpoints( self ):
     if not self._HasWindow():
       return
@@ -337,6 +339,22 @@ def JumpToBreakpointViewBreakpoint( self ):
 
     _JumpToBreakpoint( bp )
 
+  def EditBreakpointOptionsViewBreakpoint( self ):
+    vbp = self._breakpoints_view.GetBreakpointForLine()
+    if not vbp:
+      return
+
+    # Try to find the actual breakpoint
+    bp, index = self._FindLineBreakpoint( vbp.get( 'filename' ),
+                                          vbp.get( 'lnum' ) )
+
+    if not bp:
+      return
+
+    bp[ 'options' ] = GetAdvancedBreakpointOptions( bp[ 'options' ] )
+    self.UpdateUI()
+
+
   def JumpToNextBreakpoint( self, reverse=False ):
     bps = self._breakpoints_view._breakpoint_list
     if not bps:
@@ -441,6 +459,12 @@ def ClearBreakpoints( self ):
     self.UpdateUI()
 
 
+  def ResetExceptionBreakpoints( self ):
+    # TODO: Should exceptoni breakpoints be per-session!?
+    self._exception_breakpoints = None
+    self.UpdateUI()
+
+
   def _FindLineBreakpoint( self, file_name, line ):
     for bp, index in self._AllBreakpointsOnLine( file_name, line ):
       return bp, index
@@ -1224,3 +1248,26 @@ def _SignToLine( self, file_name, bp ):
       bp[ 'line' ] = int( signs[ 0 ][ 'signs' ][ 0 ][ 'lnum' ] )
 
     return
+
+
+_extended_breakpoint_properties = [
+  { 'prop': 'condition', 'msg': 'Enter condition expression' },
+  { 'prop': 'hitCondition', 'msg': 'Enter hit count expression' },
+  { 'prop': 'logMessage',
+    'msg': 'Enter log expression (to make log point)' },
+]
+
+
+def GetAdvancedBreakpointOptions( existing_options = None ):
+  # TODO: Port the vimscript function to here, call it (initially) from
+  # vimscript, then also call it from EditBreakpointOptionsViewBreakpoint
+  options = existing_options if existing_options is not None else {}
+  for spec in _extended_breakpoint_properties:
+    response = utils.AskForInput( spec[ 'msg' ] + ': ',
+                                  options.get( spec[ 'prop' ] ) )
+    if response is None:
+      return None
+    elif response:
+      options[ spec[ 'prop' ] ] = response
+
+  return options

python3/vimspector/debug_session.py

@@ -2122,6 +2122,9 @@ def DeleteBreakpointViewBreakpoint( self ):
   def JumpToBreakpointViewBreakpoint( self ):
     self._breakpoints.JumpToBreakpointViewBreakpoint()
 
+  def EditBreakpointOptionsViewBreakpoint( self ):
+    self._breakpoints.EditBreakpointOptionsViewBreakpoint()
+
   def JumpToNextBreakpoint( self ):
     self._breakpoints.JumpToNextBreakpoint()
 
@@ -2199,6 +2202,9 @@ def ClearLineBreakpoint( self, file_name, line_num ):
   def ClearBreakpoints( self ):
     return self._breakpoints.ClearBreakpoints()
 
+  def ResetExceptionBreakpoints( self ):
+    return self._breakpoints.ResetExceptionBreakpoints()
+
   def AddFunctionBreakpoint( self, function, options ):
     return self._breakpoints.AddFunctionBreakpoint( function, options )
 

support/test/python/simple_python/.vimspector.json

@@ -126,6 +126,17 @@
         }
       }
     },
+    "run - no exception bp override": {
+      "adapter": "debugpy",
+      "configuration": {
+        "request": "launch",
+        "type": "python",
+        "cwd": "${workspaceRoot}",
+        "program": "${file}",
+        "stopOnEntry": false,
+        "console": "integratedTerminal"
+      }
+    },
     "run - debugpy-python2": {
       "adapter": "debugpy-python2",
       "configuration": {