Skip to content

Commit 3c994f5

Browse files
authored
Merge pull request #883 from puremourning/update-codelldb
Update CodeLLDB to v1.11.0
2 parents 8d49791 + 5a91171 commit 3c994f5

File tree

4 files changed

+16
-75
lines changed

4 files changed

+16
-75
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
# SSH_PASS: ${{ secrets.SSH_PASS }}
9898

9999
MacOS:
100-
runs-on: 'macos-12'
100+
runs-on: 'macos-13'
101101
strategy:
102102
fail-fast: false
103103
matrix:

README.md

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ runtime dependencies). They are categorised by their level of support:
179179
| Bourne Shell | Supported | `--all` or `--enable-bash` | vscode-bash-debug | Bash v?? |
180180
| Lua | Tested | `--all` or `--enable-lua` | local-lua-debugger-vscode | Node >=12.13.0, Npm, Lua interpreter |
181181
| Node.js | Supported | `--force-enable-node` | vscode-js-debug | Node >= 18 |
182-
| Node.js (legacy) | Supported | `--force-enable-node_legacy` | vscode-node-debug2 | 6 < Node < 12, Npm |
183182
| Javascript | Supported | `--force-enable-chrome` | debugger-for-chrome | Chrome |
184183
| Javascript | Supported | `--force-enable-firefox` | vscode-firefox-debug | Firefox |
185184
| Java | Supported | `--force-enable-java ` | vscode-java-debug | Compatible LSP plugin (see [later](#java)) |
@@ -2172,41 +2171,6 @@ multiple debug sessions. For a user, that shouldn't change anything (other than
21722171
perhaps a slightly confusing stack trace). But it does make things more
21732172
complicated and so there may be subtle bugs.
21742173

2175-
* Node.js (legacy)
2176-
2177-
**NOTE**: This configuration uses the *deprecated* legacy debug adapter and will
2178-
be removed in future. Please update your configurations to use the `js-debug`
2179-
adapter. You _may_ be able to just change the adapter name.
2180-
2181-
Requires:
2182-
2183-
* `install_gadget.py --force-enable-node`
2184-
* For installation, a Node.js environment that is < node 12. I believe this is an
2185-
incompatibility with gulp. Advice, use [nvm](https://github.com/nvm-sh/nvm) with `nvm install --lts 10; nvm
2186-
use --lts 10; ./install_gadget.py --force-enable-node ...`
2187-
* Options described here:
2188-
https://code.visualstudio.com/docs/nodejs/nodejs-debugging
2189-
* Example: `support/test/node/simple`
2190-
2191-
```json
2192-
{
2193-
"configurations": {
2194-
"run": {
2195-
"adapter": "vscode-node",
2196-
"filetypes": [ "javascript", "typescript" ], // optional
2197-
"configuration": {
2198-
"request": "launch",
2199-
"protocol": "auto",
2200-
"stopOnEntry": true,
2201-
"console": "integratedTerminal",
2202-
"program": "${workspaceRoot}/simple.js",
2203-
"cwd": "${workspaceRoot}"
2204-
}
2205-
}
2206-
}
2207-
}
2208-
```
2209-
22102174
* Chrome/Firefox
22112175

22122176
This uses the chrome/firefox debugger (they are very similar), see

python3/vimspector/gadgets.py

Lines changed: 14 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@
353353
gadget ),
354354
'all': {
355355
'path': 'github.com/go-delve/delve/cmd/dlv',
356-
'version': '1.22.1',
356+
'version': '1.23.1',
357357
},
358358
'adapters': {
359359
"delve": {
@@ -463,27 +463,6 @@
463463
},
464464
},
465465
},
466-
'vscode-node-debug2': {
467-
'language': 'node_legacy',
468-
'enabled': False,
469-
'repo': {
470-
'url': 'https://github.com/microsoft/vscode-node-debug2',
471-
'ref': 'v1.43.0'
472-
},
473-
'do': lambda name, root, gadget: installer.InstallNodeDebug( name,
474-
root,
475-
gadget ),
476-
'adapters': {
477-
'vscode-node': {
478-
'name': 'node2',
479-
'type': 'node2',
480-
'command': [
481-
'node',
482-
'${gadgetDir}/vscode-node-debug2/out/src/nodeDebug.js'
483-
]
484-
},
485-
},
486-
},
487466
'vscode-firefox-debug': {
488467
'language': 'firefox',
489468
'enabled': False,
@@ -546,12 +525,12 @@
546525
'${version}/${file_name}',
547526
},
548527
'all': {
549-
'version': 'v1.10.0',
528+
'version': 'v1.11.0',
550529
},
551530
'macos': {
552-
'file_name': 'codelldb-x86_64-darwin.vsix',
531+
'file_name': 'codelldb-darwin-x64.vsix',
553532
'checksum':
554-
'91b10d5670a40434c308c09cb511a5b3e096c82b446a0bbbe4224af33204f5cf',
533+
'5be44ccc6d1e44a0cad5c67458a6968c0c6baf091093005221d467f10dd68dc6',
555534
'make_executable': [
556535
'adapter/codelldb',
557536
'lldb/bin/debugserver',
@@ -560,14 +539,14 @@
560539
],
561540
},
562541
'macos_arm64': {
563-
'file_name': 'codelldb-aarch64-darwin.vsix',
542+
'file_name': 'codelldb-darwin-arm64.vsix',
564543
'checksum':
565-
'4ab0795a726bc52d6e2fa8ebc610baa3f262ebea89adac478cf4a34c72167a41',
544+
'6634c094def2463d38b7b220bcebb49bac81391ef2e9988c4d41e88a996d726c',
566545
},
567546
'linux': {
568-
'file_name': 'codelldb-x86_64-linux.vsix',
547+
'file_name': 'codelldb-linux-x64.vsix',
569548
'checksum':
570-
'd12bff19811974e14688e9754d8d7b9a2430868c3bac883d695032a4acd012ca',
549+
'b857287f70a18a4fc2d7563aa9fdbcfa9cb2b37d5666fc78394fc8131ee335e2',
571550
'make_executable': [
572551
'adapter/codelldb',
573552
'lldb/bin/lldb',
@@ -576,19 +555,19 @@
576555
],
577556
},
578557
'linux_arm64': {
579-
'file_name': 'codelldb-aarch64-linux.vsix',
558+
'file_name': 'codelldb-linux-arm64.vsix',
580559
'checksum':
581-
'0a81f6617834754537520b7bae2ea9ad50d26b372f8c8bd967dae099e4b27d06',
560+
'ebbd358dddc1538384cdfb94823da85d13a7a3a4c3eac466de8bb5394f81386a',
582561
},
583562
'linux_armv7': {
584-
'file_name': 'codelldb-arm-linux.vsix',
563+
'file_name': 'codelldb-linux-armhf.vsix',
585564
'checksum':
586-
'4bfc5ee753d4359c9ba3cf8fc726f4245a62fd283b718b5120ef1b404baf68c9',
565+
'a22f1b38a94a94cb2cb814399de9da153cd2ddb2539b97353f05b60668fe0e9f',
587566
},
588567
'windows': {
589-
'file_name': 'codelldb-x86_64-windows.vsix',
568+
'file_name': 'codelldb-win32-x64.vsix',
590569
'checksum':
591-
'2f251384e4356edcffe168439714d00de5ca434b263719cbdaf63c9d2f0ffe64',
570+
'375807832e2e9e41dd66f000200d4a55978977f3f10ad9799286f1f9fbe017e6',
592571
'make_executable': []
593572
},
594573
'adapters': {
@@ -597,9 +576,7 @@
597576
'type': 'CodeLLDB',
598577
"command": [
599578
"${gadgetDir}/CodeLLDB/adapter/codelldb",
600-
"--port", "${unusedLocalPort}"
601579
],
602-
"port": "${unusedLocalPort}",
603580
"configuration": {
604581
"type": "lldb",
605582
"name": "lldb",

tests/ci/image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:20.04
33
ENV DEBIAN_FRONTEND=noninteractive
44
ENV LC_ALL C.UTF-8
55
ARG GOARCH=amd64
6-
ARG GOVERSION=1.20.1
6+
ARG GOVERSION=1.23.2
77
ARG NODE_MAJOR=18
88
ARG VIM_VERSION=v8.2.4797
99
ARG NVIM_VERSION=v0.8.3

0 commit comments

Comments
 (0)