Merge branch 'master' into run-to-cursor-vs

Author: mergify[bot]

.github/workflows/build.yaml

@@ -114,7 +114,9 @@ jobs:
       matrix:
         runtime:
           - vim
-          - nvim
+          # - nvim ; MacOS in GHA is so slow, this seems to cause lots of
+          # flakiness for neovim and I have like 0 patience with trying to
+          # understand why.
     steps:
     - uses: actions/checkout@v3
 

.mergify.yml

@@ -9,7 +9,7 @@ queue_rules:
       - status-success=Linux (vim)
       - status-success=Linux (nvim)
       - status-success=MacOS (vim)
-      - status-success=MacOS (nvim)
+      #- status-success=MacOS (nvim)
 
 pull_request_rules:
   - name: Merge owner PR when all checks passed
@@ -26,7 +26,7 @@ pull_request_rules:
       - status-success=Linux (vim)
       - status-success=Linux (nvim)
       - status-success=MacOS (vim)
-      - status-success=MacOS (nvim)
+      #- status-success=MacOS (nvim)
     actions: &merge-actions
       queue:
         method: merge
@@ -61,7 +61,7 @@ pull_request_rules:
       - status-success=Linux (vim)
       - status-success=Linux (nvim)
       - status-success=MacOS (vim)
-      - status-success=MacOS (nvim)
+      #- status-success=MacOS (nvim)
     actions:
       <<: *merge-actions
       comment:

README.md

@@ -1792,6 +1792,7 @@ Rust is supported with any gdb/lldb-based debugger. So it works fine with
 1. To use the ["custom" launch](https://github.com/vadimcn/vscode-lldb/blob/master/MANUAL.md#custom-launch), you can't use `"request": "custom"` - this is invalid. Instead use `"request": "launch", "custom": true`. Because [reasons](https://github.com/vadimcn/vscode-lldb/blob/master/extension/main.ts#L397-L401)
 2. All the integration with `cargo` is done in the vscode javascript madness, so is not supported.
 3. The stuff about [remote agents](https://github.com/vadimcn/vscode-lldb/blob/master/MANUAL.md#connecting-to-a-gdbserver-style-agent) uses `"request": custom`; see the point about "custom" launch above
+4. Source Mapping (i.e., enabling `step-into` for standard library functions) can be done by adding `"sourceMap": { "from_path" : "to_path" }`. `"from_path"` can be found in disassembly window by going up in the stack trace; `"to_path"` is just your locally installed standard library path for current toolchain.
 
 ## Jai
 

doc/vimspector.txt

@@ -2117,6 +2117,12 @@ Rust is supported with any gdb/lldb-based debugger. So it works fine with
 - The stuff about remote agents [42] uses '"request": custom'; see the point
   about "custom" launch above
 
+- Source Mapping (i.e., enabling 'step-into' for standard library functions)
+  can be done by adding '"sourceMap": { "from_path" : "to_path" }'.
+  '"from_path"' can be found in disassembly window by going up in the stack
+  trace; '"to_path"' is just your locally installed standard library path for
+  current toolchain.
+
 -------------------------------------------------------------------------------
                                                                *vimspector-jai*
 Jai ~

docs/Gemfile.lock

@@ -205,22 +205,22 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.2)
+    mini_portile2 (2.8.5)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.19.0)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.16.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.6.2)
+    racc (1.7.3)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)

python3/vimspector/debug_session.py

@@ -329,7 +329,8 @@ def Start( self,
               self._api_prefix,
               False, # Don't leave open
               *shlex.split( response ),
-              then = lambda: self.Start( new_launch_variables ) )
+              then = lambda: self.Start(
+                launch_variables = new_launch_variables ) )
             return
           elif response is None:
             return
@@ -371,7 +372,8 @@ def Start( self,
               self._api_prefix,
               False, # Don't leave open
               *shlex.split( response ),
-              then = lambda: self.Start( new_launch_variables ) )
+              then = lambda: self.Start(
+                launch_variables = new_launch_variables ) )
             return
           elif response is None:
             return

python3/vimspector/variables.py

@@ -176,6 +176,10 @@ def SetCurrentFrame( self, connection, frame ):
     elif self.connection != connection:
       return
 
+    if frame is None:
+      # Evaluation in a context where there is no current frame.
+      return
+
     self.expression[ 'frameId' ] = frame[ 'id' ]
 
   @staticmethod

support/test/python/django/requirements.txt

@@ -1 +1 @@
-Django==4.2.7
+Django==4.2.10

tests/variables.test.vim

@@ -19,15 +19,15 @@ function! ConsoleBufferName()
 endfunction
 
 function! s:StartDebugging( ... )
-  if a:0 == 0
-    let config = #{
-          \   fn: s:fn,
-          \   line: 23,
-          \   col: 1,
-          \   launch: #{ configuration: 'run' }
-          \ }
-  else
-    let config = a:1
+  let config = #{
+        \   fn: s:fn,
+        \   line: 23,
+        \   col: 1,
+        \   launch: #{ configuration: 'run' }
+        \ }
+
+  if a:0 > 0
+    call extend( config, a:1 )
   endif
 
   execute 'edit' config.fn
@@ -1265,3 +1265,43 @@ EOF
   call vimspector#test#setup#Reset()
   %bwipe!
 endfunction
+
+function! Test_WatchAfterExit()
+  call s:StartDebugging( #{
+        \ col: v:null,
+        \ line: 3,
+        \ fn: 'testdata/cpp/simple/tiny.c',
+        \ launch: #{ configuration: 'CodeLLDB' }
+        \ } )
+
+  call vimspector#Continue()
+  call WaitForAssert( {->
+        \   AssertMatchList(
+        \     [
+        \         '+ Thread [0-9]\+: .* (terminated)',
+        \     ],
+        \     GetBufLine( winbufnr( g:vimspector_session_windows.stack_trace ),
+        \                 1,
+        \                 '$' )
+        \   )
+        \ } )
+
+  " Add a wtch
+  call vimspector#AddWatch( 'res' )
+
+  call WaitForAssert( {->
+        \   AssertMatchList(
+        \     [
+        \       'Watches: ----',
+        \       'Expression: res',
+        \       ' \*- Result: .*',
+        \     ],
+        \     getbufline( winbufnr( g:vimspector_session_windows.watches ),
+        \                 1,
+        \                 '$' )
+        \   )
+        \ } )
+
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction