Merge pull request #764 from puremourning/fix-breakpoinhts-display-after-stop

Fix showing breakpoints when connection closed

Author: mergify[bot]

python3/vimspector/breakpoints.py

@@ -276,10 +276,11 @@ def ConnectionClosed( self, connection: DebugAdapterConnection ):
       self._awaiting_bp_responses = 0
       self._pending_send_breakpoints = []
 
-    # NOTE: we don't reset self._exception_breakpoints because we don't want to
-    # re-ask the user every time for the sane info.
-
-    # FIXME: If the adapter type changes, we should probably forget this ?
+    # Ensure that we now display verified/etc. breakpoints correctly (we might
+    # have closed the connection that verified a given BP). If this was the last
+    # connection closing, then we need to re-post all the breakpoints as "user"
+    # breakpoints (as opposed to server ones). All this is done by UpdateUI()
+    self.UpdateUI()
 
 
   def ToggleBreakpointsView( self ):

python3/vimspector/debug_session.py

@@ -2037,7 +2037,6 @@ def OnServerExit( self, status ):
       self._disassemblyView.ConnectionClosed( self._connection )
 
     self.Clear()
-
     self._ResetServerState()
 
     if self._run_on_server_exit:

tests/breakpoints.test.vim

@@ -1508,3 +1508,46 @@ function! Test_LineBreakpoint_Moved_By_Server()
   call vimspector#test#setup#Reset()
   %bwipe!
 endfunction
+
+function! Test_ShowBreakpointsAfterStop()
+  let fn = '../support/test/python/simple_python/main.py'
+  exe 'edit' fn
+  call vimspector#SetLineBreakpoint( fn, 23 )
+  call vimspector#test#signs#AssertSignGroupSingletonAtLine(
+        \ 'VimspectorBP',
+        \ 23,
+        \ 'vimspectorBP',
+        \ 9 )
+  call vimspector#LaunchWithSettings( { 'configuration': 'run' } )
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 23, 1 )
+  call vimspector#test#signs#AssertSignGroupSingletonAtLine(
+        \ 'VimspectorCode',
+        \ 23,
+        \ 'vimspectorPCBP',
+        \ 200 )
+
+  call vimspector#ListBreakpoints()
+  call s:CheckBreakpointView( [
+        \ 'main.py:23 Line breakpoint - VERIFIED: {}'
+        \ ] )
+  wincmd p
+  call vimspector#ListBreakpoints()
+
+  call vimspector#Stop()
+  call WaitForAssert( { ->
+        \ vimspector#test#signs#AssertSignGroupSingletonAtLine(
+        \   'VimspectorBP',
+        \   23,
+        \   'vimspectorBP',
+        \   9 ) } )
+
+  call vimspector#ListBreakpoints()
+  call s:CheckBreakpointView( [
+        \ 'main.py:23 Line breakpoint - ENABLED: {}'
+        \ ] )
+  wincmd p
+  call vimspector#ListBreakpoints()
+
+  call vimspector#test#setup#Reset()
+  %bwipeout!
+endfunction