feat(lsp): add debugOverrideCommand option#22236
Open
shorwood wants to merge 1 commit into
Open
Conversation
rustbot
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
shorwood
force-pushed
the
feat/lsp-debug-override-command
branch
from
a7a3150 to
0e6e8b5
Compare
Collaborator
|
☔ The latest upstream changes (possibly #22284) made this pull request unmergeable. Please resolve the merge conflicts. |
ChayimFriedman2
requested changes
May 7, 2026
| @@ -453,6 +453,15 @@ pub struct Runnable { | |||
| pub location: Option<lsp_types::LocationLink>, | |||
| pub kind: RunnableKind, | |||
Contributor
There was a problem hiding this comment.
Makes sense to also use RunnableCommand here? You can use serde(flatten).
| location: Some(location), | ||
| kind: lsp_ext::RunnableKind::Shell, | ||
| args: lsp_ext::RunnableArgs::Shell(runnable_args), | ||
| debug: None, |
Contributor
There was a problem hiding this comment.
Why don't we pass debug here too? It's even more useful for rust-project.json.
| executable_args, | ||
| environment: Default::default(), | ||
| }), | ||
| debug: None, |
Contributor
There was a problem hiding this comment.
And here too.
| /// - `${include_ignored}`: always empty for benchmarks. | ||
| /// - `${executable_args}`: all of the above binary args bundled together | ||
| /// (includes `rust-analyzer.runnables.extraTestBinaryArgs`). | ||
| runnables_bench_debugOverrideCommand: Option<Vec<String>> = None, |
Contributor
There was a problem hiding this comment.
overrideDebugCommand makes more sense, the current name sounds like we're debugging the override.
Comment on lines
+190
to
+196
| env: includeShellExtraEnv | ||
| ? prepareEnv( | ||
| true, | ||
| runnableArgs.environment, | ||
| config.runnablesExtraEnv(runnable.label), | ||
| ) | ||
| : prepareBaseEnv(true), |
Contributor
There was a problem hiding this comment.
Why is this?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #22128
Adds
debugOverrideCommandfor test and bench runnables so debug can use a different command from Run. This is needed for runners like nextest, where running a test and debugging a test require different command shapes.The setting is opt-in. Existing
overrideCommand, Cargo debug config generation, and matchinglaunch.jsonentries keep their current behavior.For reference, here's my setup with this PR active.
{ "rust-analyzer.server.path": "$HOME/Workspaces/rust-analyzer/target/debug/rust-analyzer", "rust-analyzer.runnables.test.overrideCommand": [ "nix", "shell", "nixpkgs#cargo-nextest", "-c", "cargo", "nextest", "run", "--config", "profile.dev.debug=2", "--package", "${package}", "${target_arg}", "${target}", "--", "${test_name}", "${exact}", "${include_ignored}" ], "rust-analyzer.runnables.test.debugOverrideCommand": [ "nix", "shell", "nixpkgs#cargo-nextest", "-c", "cargo", "nextest", "run", "--config", "profile.dev.debug=2", "--package", "${package}", "${target_arg}", "${target}", "--debugger", "$HOME/.vscode/extensions/vadimcn.vscode-lldb-1.12.1/bin/codelldb-launch --connect 127.0.0.1:12345 --", "--", "${test_name}", "${exact}", "${include_ignored}" ], "rust-analyzer.runnables.extraEnv": { "CODELLDB_LAUNCH_CONFIG": "{ token: 'secret' }" }, "lldb.rpcServer": { "host": "127.0.0.1", "port": 12345, "token": "secret" } }