Skip to content

Commit cb32c1f

Browse files
jordanpwalshjordanpwalsh
authored
Merge branch 'master' into docker-workdir-support
2 parents 9b394cf + def0926 commit cb32c1f

File tree

17 files changed

+174
-31
lines changed

17 files changed

+174
-31
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ jobs:
114114
matrix:
115115
runtime:
116116
- vim
117-
- nvim
117+
# - nvim ; MacOS in GHA is so slow, this seems to cause lots of
118+
# flakiness for neovim and I have like 0 patience with trying to
119+
# understand why.
118120
steps:
119121
- uses: actions/checkout@v3
120122

‎.mergify.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ queue_rules:
99
- status-success=Linux (vim)
1010
- status-success=Linux (nvim)
1111
- status-success=MacOS (vim)
12-
- status-success=MacOS (nvim)
12+
#- status-success=MacOS (nvim)
1313

1414
pull_request_rules:
1515
- name: Merge owner PR when all checks passed
@@ -26,7 +26,7 @@ pull_request_rules:
2626
- status-success=Linux (vim)
2727
- status-success=Linux (nvim)
2828
- status-success=MacOS (vim)
29-
- status-success=MacOS (nvim)
29+
#- status-success=MacOS (nvim)
3030
actions: &merge-actions
3131
queue:
3232
method: merge
@@ -61,7 +61,7 @@ pull_request_rules:
6161
- status-success=Linux (vim)
6262
- status-success=Linux (nvim)
6363
- status-success=MacOS (vim)
64-
- status-success=MacOS (nvim)
64+
#- status-success=MacOS (nvim)
6565
actions:
6666
<<: *merge-actions
6767
comment:

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,10 +738,16 @@ let g:vimspector_enable_mappings = 'VISUAL_STUDIO'
738738
| `F9` | `<Plug>VimspectorToggleBreakpoint` | Toggle line breakpoint on the current line.
739739
| `Shift F9` | `<Plug>VimspectorAddFunctionBreakpoint` | Add a function breakpoint for the expression under cursor
740740
| `F10` | `<Plug>VimspectorStepOver` | Step Over
741+
| `Ctrl F10` | `<Plug>VimspectorRunToCursor` | Run to cursor*
741742
| `F11` | `<Plug>VimspectorStepInto` | Step Into
742743
| `Shift F11` | `<Plug>VimspectorStepOut` | Step out of current function scope
743744
| `Alt 8` | `<Plug>VimspectorDisassemble` | Show disassembly
744745

746+
***NOTE: Some mappings, such as ctrl and F-keys may not work depending on your
747+
terminal, keyboard, windowing system and all sorts of other things.
748+
See `:help modifyOtherKeys` and other sources. If you are unable to make this
749+
work, just use the "human mode" mappings.***
750+
745751
## Human Mode
746752

747753
If, like me, you only have 2 hands and 10 fingers, you probably don't like
@@ -1786,6 +1792,7 @@ Rust is supported with any gdb/lldb-based debugger. So it works fine with
17861792
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)
17871793
2. All the integration with `cargo` is done in the vscode javascript madness, so is not supported.
17881794
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
1795+
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.
17891796

17901797
## Jai
17911798

‎doc/vimspector.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,8 @@ loading vimspector**:
962962
----------------------------------------------------------------------------------------------------------------------------
963963
| 'F10' | '<Plug>VimspectorStepOver' | Step Over |
964964
----------------------------------------------------------------------------------------------------------------------------
965+
| 'Ctrl F10' | '<Plug>VimspectorRunToCursor' | Run to cursor* |
966+
----------------------------------------------------------------------------------------------------------------------------
965967
| 'F11' | '<Plug>VimspectorStepInto' | Step Into |
966968
----------------------------------------------------------------------------------------------------------------------------
967969
| 'Shift F11' | '<Plug>VimspectorStepOut' | Step out of current function scope |
@@ -970,6 +972,11 @@ loading vimspector**:
970972
----------------------------------------------------------------------------------------------------------------------------
971973

972974

975+
**_NOTE: Some mappings, such as ctrl and F-keys may not work depending on your
976+
terminal, keyboard, windowing system and all sorts of other things. See ':help
977+
modifyOtherKeys' and other sources. If you are unable to make this work, just
978+
use the "human mode" mappings._**
979+
973980
-------------------------------------------------------------------------------
974981
*vimspector-human-mode*
975982
Human Mode ~
@@ -2117,6 +2124,12 @@ Rust is supported with any gdb/lldb-based debugger. So it works fine with
21172124
- The stuff about remote agents [42] uses '"request": custom'; see the point
21182125
about "custom" launch above
21192126

2127+
- Source Mapping (i.e., enabling 'step-into' for standard library functions)
2128+
can be done by adding '"sourceMap": { "from_path" : "to_path" }'.
2129+
'"from_path"' can be found in disassembly window by going up in the stack
2130+
trace; '"to_path"' is just your locally installed standard library path for
2131+
current toolchain.
2132+
21202133
-------------------------------------------------------------------------------
21212134
*vimspector-jai*
21222135
Jai ~

‎docs/Gemfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,22 +205,22 @@ GEM
205205
rb-fsevent (~> 0.10, >= 0.10.3)
206206
rb-inotify (~> 0.9, >= 0.9.10)
207207
mercenary (0.3.6)
208-
mini_portile2 (2.8.2)
208+
mini_portile2 (2.8.5)
209209
minima (2.5.1)
210210
jekyll (>= 3.5, < 5.0)
211211
jekyll-feed (~> 0.9)
212212
jekyll-seo-tag (~> 2.1)
213213
minitest (5.19.0)
214-
nokogiri (1.14.3)
215-
mini_portile2 (~> 2.8.0)
214+
nokogiri (1.16.2)
215+
mini_portile2 (~> 2.8.2)
216216
racc (~> 1.4)
217217
octokit (4.25.1)
218218
faraday (>= 1, < 3)
219219
sawyer (~> 0.9)
220220
pathutil (0.16.2)
221221
forwardable-extended (~> 2.6)
222222
public_suffix (4.0.7)
223-
racc (1.6.2)
223+
racc (1.7.3)
224224
rb-fsevent (0.11.2)
225225
rb-inotify (0.10.1)
226226
ffi (~> 1.0)

‎plugin/vimspector.vim‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ if s:mappings ==# 'VISUAL_STUDIO'
130130
nmap <F9> <Plug>VimspectorToggleBreakpoint
131131
nmap <S-F9> <Plug>VimspectorAddFunctionBreakpoint
132132
nmap <F10> <Plug>VimspectorStepOver
133+
nmap <C-F10> <Plug>VimspectorRunToCursor
133134
nmap <F11> <Plug>VimspectorStepInto
134135
nmap <S-F11> <Plug>VimspectorStepOut
135136
nmap <M-8> <Plug>VimspectorDisassemble

‎python3/vimspector/debug_session.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,8 @@ def Start( self,
329329
self._api_prefix,
330330
False, # Don't leave open
331331
*shlex.split( response ),
332-
then = lambda: self.Start( new_launch_variables ) )
332+
then = lambda: self.Start(
333+
launch_variables = new_launch_variables ) )
333334
return
334335
elif response is None:
335336
return
@@ -371,7 +372,8 @@ def Start( self,
371372
self._api_prefix,
372373
False, # Don't leave open
373374
*shlex.split( response ),
374-
then = lambda: self.Start( new_launch_variables ) )
375+
then = lambda: self.Start(
376+
launch_variables = new_launch_variables ) )
375377
return
376378
elif response is None:
377379
return

‎python3/vimspector/gadgets.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -546,12 +546,12 @@
546546
'${version}/${file_name}',
547547
},
548548
'all': {
549-
'version': 'v1.9.2',
549+
'version': 'v1.10.0',
550550
},
551551
'macos': {
552552
'file_name': 'codelldb-x86_64-darwin.vsix',
553553
'checksum':
554-
'0b36e91930bca3344cf9b78984ee85ccacc6dc97ab9be5da935d4596f0dba05c',
554+
'91b10d5670a40434c308c09cb511a5b3e096c82b446a0bbbe4224af33204f5cf',
555555
'make_executable': [
556556
'adapter/codelldb',
557557
'lldb/bin/debugserver',
@@ -562,12 +562,12 @@
562562
'macos_arm64': {
563563
'file_name': 'codelldb-aarch64-darwin.vsix',
564564
'checksum':
565-
'5db25c0b1277795e2196a9118a38e6984b4787ac2c1e3e3adfeefe537296fc51',
565+
'4ab0795a726bc52d6e2fa8ebc610baa3f262ebea89adac478cf4a34c72167a41',
566566
},
567567
'linux': {
568568
'file_name': 'codelldb-x86_64-linux.vsix',
569569
'checksum':
570-
'898bd22b2505b12671fee7d2fe1abb384dc60d13f5fec2b4b650d0dac3f83d75',
570+
'd12bff19811974e14688e9754d8d7b9a2430868c3bac883d695032a4acd012ca',
571571
'make_executable': [
572572
'adapter/codelldb',
573573
'lldb/bin/lldb',
@@ -578,17 +578,17 @@
578578
'linux_arm64': {
579579
'file_name': 'codelldb-aarch64-linux.vsix',
580580
'checksum':
581-
'90c23169d5c32b6c3c6c040622f5f181af3e8a0a7d47e01219ce0af4a70aadb4',
581+
'0a81f6617834754537520b7bae2ea9ad50d26b372f8c8bd967dae099e4b27d06',
582582
},
583583
'linux_armv7': {
584584
'file_name': 'codelldb-arm-linux.vsix',
585585
'checksum':
586-
'971a9def71f8093ee63c1944dd69e3fbada97fc2804d312ab22e75f6d7e4e207',
586+
'4bfc5ee753d4359c9ba3cf8fc726f4245a62fd283b718b5120ef1b404baf68c9',
587587
},
588588
'windows': {
589589
'file_name': 'codelldb-x86_64-windows.vsix',
590590
'checksum':
591-
'1c23239941165d051b904a95c0bbf0853d3ff9b9149cdf36c6763fd4937c95f1',
591+
'2f251384e4356edcffe168439714d00de5ca434b263719cbdaf63c9d2f0ffe64',
592592
'make_executable': []
593593
},
594594
'adapters': {

‎python3/vimspector/variables.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ def SetCurrentFrame( self, connection, frame ):
176176
elif self.connection != connection:
177177
return
178178

179+
if frame is None:
180+
# Evaluation in a context where there is no current frame.
181+
return
182+
179183
self.expression[ 'frameId' ] = frame[ 'id' ]
180184

181185
@staticmethod
@@ -671,7 +675,7 @@ def GetMemoryReference( self ):
671675
# Get a memoryReference for use in a ReadMemory request
672676
variable, _ = self._GetVariable( None, None )
673677
if variable is None:
674-
return None
678+
return None, None
675679

676680
# TODO: Return the connection too!
677681
return variable.connection, variable.MemoryReference()

‎support/test/python/django/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Django==4.2.7
1+
Django==4.2.10

0 commit comments

Comments
 (0)