Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CodeLLDB to v1.11.0 #883

Merged
merged 6 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
# SSH_PASS: ${{ secrets.SSH_PASS }}

MacOS:
runs-on: 'macos-12'
runs-on: 'macos-13'
strategy:
fail-fast: false
matrix:
Expand Down
36 changes: 0 additions & 36 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)) |
Expand Down Expand Up @@ -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
Expand Down
51 changes: 14 additions & 37 deletions python3/vimspector/gadgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
gadget ),
'all': {
'path': 'github.com/go-delve/delve/cmd/dlv',
'version': '1.22.1',
'version': '1.23.1',
},
'adapters': {
"delve": {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -546,12 +525,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',
Expand All @@ -560,14 +539,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',
Expand All @@ -576,19 +555,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': {
Expand All @@ -597,9 +576,7 @@
'type': 'CodeLLDB',
"command": [
"${gadgetDir}/CodeLLDB/adapter/codelldb",
"--port", "${unusedLocalPort}"
],
"port": "${unusedLocalPort}",
"configuration": {
"type": "lldb",
"name": "lldb",
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading