From 727fc4113038069681a6afcd14414d3ef433bd9a Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Tue, 8 Oct 2024 21:01:12 +0100 Subject: [PATCH 1/6] Update CodeLLDB to v1.11.0 --- python3/vimspector/gadgets.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/python3/vimspector/gadgets.py b/python3/vimspector/gadgets.py index 44d48218..eca12160 100644 --- a/python3/vimspector/gadgets.py +++ b/python3/vimspector/gadgets.py @@ -546,12 +546,12 @@ '${version}/${file_name}', }, 'all': { - 'version': 'v1.10.0', + 'version': 'v1.11.0', }, 'macos': { - 'file_name': 'codelldb-x86_64-darwin.vsix', + 'file_name': 'codelldb-darwin-x64.vsix', 'checksum': - '91b10d5670a40434c308c09cb511a5b3e096c82b446a0bbbe4224af33204f5cf', + '5be44ccc6d1e44a0cad5c67458a6968c0c6baf091093005221d467f10dd68dc6', 'make_executable': [ 'adapter/codelldb', 'lldb/bin/debugserver', @@ -560,14 +560,14 @@ ], }, 'macos_arm64': { - 'file_name': 'codelldb-aarch64-darwin.vsix', + 'file_name': 'codelldb-darwin-arm64.vsix', 'checksum': - '4ab0795a726bc52d6e2fa8ebc610baa3f262ebea89adac478cf4a34c72167a41', + '6634c094def2463d38b7b220bcebb49bac81391ef2e9988c4d41e88a996d726c', }, 'linux': { - 'file_name': 'codelldb-x86_64-linux.vsix', + 'file_name': 'codelldb-linux-x64.vsix', 'checksum': - 'd12bff19811974e14688e9754d8d7b9a2430868c3bac883d695032a4acd012ca', + 'b857287f70a18a4fc2d7563aa9fdbcfa9cb2b37d5666fc78394fc8131ee335e2', 'make_executable': [ 'adapter/codelldb', 'lldb/bin/lldb', @@ -576,19 +576,19 @@ ], }, 'linux_arm64': { - 'file_name': 'codelldb-aarch64-linux.vsix', + 'file_name': 'codelldb-linux-arm64.vsix', 'checksum': - '0a81f6617834754537520b7bae2ea9ad50d26b372f8c8bd967dae099e4b27d06', + 'ebbd358dddc1538384cdfb94823da85d13a7a3a4c3eac466de8bb5394f81386a', }, 'linux_armv7': { - 'file_name': 'codelldb-arm-linux.vsix', + 'file_name': 'codelldb-linux-armhf.vsix', 'checksum': - '4bfc5ee753d4359c9ba3cf8fc726f4245a62fd283b718b5120ef1b404baf68c9', + 'a22f1b38a94a94cb2cb814399de9da153cd2ddb2539b97353f05b60668fe0e9f', }, 'windows': { - 'file_name': 'codelldb-x86_64-windows.vsix', + 'file_name': 'codelldb-win32-x64.vsix', 'checksum': - '2f251384e4356edcffe168439714d00de5ca434b263719cbdaf63c9d2f0ffe64', + '375807832e2e9e41dd66f000200d4a55978977f3f10ad9799286f1f9fbe017e6', 'make_executable': [] }, 'adapters': { From d7f42bfdf300fde9ebadffc616b32106dfa6adcc Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Tue, 8 Oct 2024 21:09:12 +0100 Subject: [PATCH 2/6] Use stdio for codelldb transport This is much faster to start up in practice and simpler, less error prone. THanks to https://github.com/vadimcn/codelldb/pull/1135 --- python3/vimspector/gadgets.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python3/vimspector/gadgets.py b/python3/vimspector/gadgets.py index eca12160..c96e278c 100644 --- a/python3/vimspector/gadgets.py +++ b/python3/vimspector/gadgets.py @@ -597,9 +597,7 @@ 'type': 'CodeLLDB', "command": [ "${gadgetDir}/CodeLLDB/adapter/codelldb", - "--port", "${unusedLocalPort}" ], - "port": "${unusedLocalPort}", "configuration": { "type": "lldb", "name": "lldb", From 977a81b255a48b4774ad3603ac645a38a469a5e3 Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Tue, 8 Oct 2024 22:39:35 +0100 Subject: [PATCH 3/6] Update macOS to 13 in CI; next one is arm64... --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 916f164e..fed98479 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -97,7 +97,7 @@ jobs: # SSH_PASS: ${{ secrets.SSH_PASS }} MacOS: - runs-on: 'macos-12' + runs-on: 'macos-13' strategy: fail-fast: false matrix: From 2f5420fb63f9c9ba0023c448518751f216cf6baf Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Tue, 8 Oct 2024 23:20:13 +0100 Subject: [PATCH 4/6] Update delve to 1.23.1 --- python3/vimspector/gadgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3/vimspector/gadgets.py b/python3/vimspector/gadgets.py index c96e278c..193a66e1 100644 --- a/python3/vimspector/gadgets.py +++ b/python3/vimspector/gadgets.py @@ -353,7 +353,7 @@ gadget ), 'all': { 'path': 'github.com/go-delve/delve/cmd/dlv', - 'version': '1.22.1', + 'version': '1.23.1', }, 'adapters': { "delve": { From e3739100ffb5df0a1ddd04a1de599389e2c3628b Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Tue, 8 Oct 2024 23:20:35 +0100 Subject: [PATCH 5/6] remove vscode-node-debug2 --- README.md | 36 ----------------------------------- python3/vimspector/gadgets.py | 21 -------------------- 2 files changed, 57 deletions(-) diff --git a/README.md b/README.md index 2df4d323..f379c36a 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,6 @@ runtime dependencies). They are categorised by their level of support: | Bourne Shell | Supported | `--all` or `--enable-bash` | vscode-bash-debug | Bash v?? | | Lua | Tested | `--all` or `--enable-lua` | local-lua-debugger-vscode | Node >=12.13.0, Npm, Lua interpreter | | Node.js | Supported | `--force-enable-node` | vscode-js-debug | Node >= 18 | -| Node.js (legacy) | Supported | `--force-enable-node_legacy` | vscode-node-debug2 | 6 < Node < 12, Npm | | Javascript | Supported | `--force-enable-chrome` | debugger-for-chrome | Chrome | | Javascript | Supported | `--force-enable-firefox` | vscode-firefox-debug | Firefox | | 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 perhaps a slightly confusing stack trace). But it does make things more complicated and so there may be subtle bugs. -* Node.js (legacy) - -**NOTE**: This configuration uses the *deprecated* legacy debug adapter and will -be removed in future. Please update your configurations to use the `js-debug` -adapter. You _may_ be able to just change the adapter name. - -Requires: - -* `install_gadget.py --force-enable-node` -* For installation, a Node.js environment that is < node 12. I believe this is an - incompatibility with gulp. Advice, use [nvm](https://github.com/nvm-sh/nvm) with `nvm install --lts 10; nvm - use --lts 10; ./install_gadget.py --force-enable-node ...` -* Options described here: - https://code.visualstudio.com/docs/nodejs/nodejs-debugging -* Example: `support/test/node/simple` - -```json -{ - "configurations": { - "run": { - "adapter": "vscode-node", - "filetypes": [ "javascript", "typescript" ], // optional - "configuration": { - "request": "launch", - "protocol": "auto", - "stopOnEntry": true, - "console": "integratedTerminal", - "program": "${workspaceRoot}/simple.js", - "cwd": "${workspaceRoot}" - } - } - } -} -``` - * Chrome/Firefox This uses the chrome/firefox debugger (they are very similar), see diff --git a/python3/vimspector/gadgets.py b/python3/vimspector/gadgets.py index 193a66e1..a84f7f7d 100644 --- a/python3/vimspector/gadgets.py +++ b/python3/vimspector/gadgets.py @@ -463,27 +463,6 @@ }, }, }, - 'vscode-node-debug2': { - 'language': 'node_legacy', - 'enabled': False, - 'repo': { - 'url': 'https://github.com/microsoft/vscode-node-debug2', - 'ref': 'v1.43.0' - }, - 'do': lambda name, root, gadget: installer.InstallNodeDebug( name, - root, - gadget ), - 'adapters': { - 'vscode-node': { - 'name': 'node2', - 'type': 'node2', - 'command': [ - 'node', - '${gadgetDir}/vscode-node-debug2/out/src/nodeDebug.js' - ] - }, - }, - }, 'vscode-firefox-debug': { 'language': 'firefox', 'enabled': False, From 5a91171184028d3c5dc1616d4c6510cb6022c072 Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Tue, 8 Oct 2024 23:32:45 +0100 Subject: [PATCH 6/6] Update go to 1.23.2 --- tests/ci/image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ci/image/Dockerfile b/tests/ci/image/Dockerfile index 3b86ef06..036059ac 100644 --- a/tests/ci/image/Dockerfile +++ b/tests/ci/image/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive ENV LC_ALL C.UTF-8 ARG GOARCH=amd64 -ARG GOVERSION=1.20.1 +ARG GOVERSION=1.23.2 ARG NODE_MAJOR=18 ARG VIM_VERSION=v8.2.4797 ARG NVIM_VERSION=v0.8.3