diff --git a/crates/ide-dap/src/adapter.rs b/crates/ide-dap/src/adapter.rs index 25c44cdd6..91901492c 100644 --- a/crates/ide-dap/src/adapter.rs +++ b/crates/ide-dap/src/adapter.rs @@ -64,13 +64,13 @@ fn builtin(adapter: &str) -> Option { "codelldb", &["--port", PORT_PLACEHOLDER], "tcp", - "Install the CodeLLDB adapter (https://github.com/vadimcn/codelldb/releases) and put `codelldb` on PATH", + "Install CodeLLDB in Settings › Languages & Frameworks › Language Servers", ), "kotlin-debug-adapter" => cfg( "kotlin-debug-adapter", &[], "stdio", - "Install the Kotlin Debug Adapter from Settings > Language Servers", + "Install Kotlin Debug Adapter in Settings › Languages & Frameworks › Language Servers", ), // Windows installs `python.exe`; `python3.exe` there is at most a Store alias. "debugpy" => cfg( @@ -84,7 +84,7 @@ fn builtin(adapter: &str) -> Option { // Without a host it listens on `localhost`, which may resolve to ::1 only. &[PORT_PLACEHOLDER, "127.0.0.1"], "tcp", - "Install vscode-js-debug's DAP server (js-debug-dap-*.tar.gz from https://github.com/microsoft/vscode-js-debug/releases) as `js-debug-adapter`", + "Install JavaScript Debugger (vscode-js-debug) in Settings › Languages & Frameworks › Language Servers", ), "delve" => cfg( "dlv", @@ -96,7 +96,7 @@ fn builtin(adapter: &str) -> Option { "netcoredbg", &["--interpreter=vscode"], "stdio", - "Install Samsung netcoredbg (https://github.com/Samsung/netcoredbg/releases)", + "Install netcoredbg (.NET debugger) in Settings › Languages & Frameworks › Language Servers", ), "lldb-dap" => { cfg("lldb-dap", &[], "stdio", "Install LLVM's lldb-dap (brew install llvm; on macOS `xcrun -f lldb-dap`)") @@ -668,7 +668,7 @@ mod tests { assert!(find_binary("definitely-not-a-real-binary-openidea", &spec.cwd).is_none()); let err = missing(&spec); assert_eq!(err.kind, ide_core::error::ErrorKind::Unavailable); - assert!(err.message.contains("netcoredbg/releases")); + assert!(err.message.contains("Settings › Languages & Frameworks › Language Servers")); } #[tokio::test] diff --git a/languages/csharp.toml b/languages/csharp.toml index ef8d6bd4a..35e2b516c 100644 --- a/languages/csharp.toml +++ b/languages/csharp.toml @@ -17,4 +17,4 @@ install-hint = "dotnet tool install --global csharp-ls" adapter = "netcoredbg" command = "netcoredbg" args = ["--interpreter=vscode"] -install-hint = "Install Samsung netcoredbg (https://github.com/Samsung/netcoredbg/releases)" +install-hint = "Install netcoredbg (.NET debugger) in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/fsharp.toml b/languages/fsharp.toml index cf989e421..d9c80d997 100644 --- a/languages/fsharp.toml +++ b/languages/fsharp.toml @@ -18,4 +18,4 @@ initialization-options = { AutomaticWorkspaceInit = true } adapter = "netcoredbg" command = "netcoredbg" args = ["--interpreter=vscode"] -install-hint = "Install Samsung netcoredbg (https://github.com/Samsung/netcoredbg/releases)" +install-hint = "Install netcoredbg (.NET debugger) in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/javascript.toml b/languages/javascript.toml index 70954b50a..1830bf6cc 100644 --- a/languages/javascript.toml +++ b/languages/javascript.toml @@ -59,4 +59,4 @@ adapter = "js-debug" command = "js-debug-adapter" args = ["${port}", "127.0.0.1"] transport = "tcp" -install-hint = "Install vscode-js-debug's DAP server (js-debug-dap-*.tar.gz from https://github.com/microsoft/vscode-js-debug/releases) as `js-debug-adapter`" +install-hint = "Install JavaScript Debugger (vscode-js-debug) in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/javascriptreact.toml b/languages/javascriptreact.toml index cdab8c31f..a19a5e850 100644 --- a/languages/javascriptreact.toml +++ b/languages/javascriptreact.toml @@ -58,4 +58,4 @@ adapter = "js-debug" command = "js-debug-adapter" args = ["${port}", "127.0.0.1"] transport = "tcp" -install-hint = "Install vscode-js-debug's DAP server (js-debug-dap-*.tar.gz from https://github.com/microsoft/vscode-js-debug/releases) as `js-debug-adapter`" +install-hint = "Install JavaScript Debugger (vscode-js-debug) in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/kotlin.toml b/languages/kotlin.toml index 097eafcd3..30820ea4f 100644 --- a/languages/kotlin.toml +++ b/languages/kotlin.toml @@ -32,4 +32,4 @@ install-hint = "brew install kotlin-language-server (https://github.com/fwcd/kot [debugger] adapter = "kotlin-debug-adapter" command = "kotlin-debug-adapter" -install-hint = "Install https://github.com/fwcd/kotlin-debug-adapter and put `kotlin-debug-adapter` on PATH" +install-hint = "Install Kotlin Debug Adapter in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/rust.toml b/languages/rust.toml index fcd712e3e..766651082 100644 --- a/languages/rust.toml +++ b/languages/rust.toml @@ -23,4 +23,4 @@ adapter = "codelldb" command = "codelldb" args = ["--port", "${port}"] transport = "tcp" -install-hint = "Install the CodeLLDB adapter (https://github.com/vadimcn/codelldb/releases) and put `codelldb` on PATH" +install-hint = "Install CodeLLDB in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/shellscript.toml b/languages/shellscript.toml index ebda1d965..718f03d63 100644 --- a/languages/shellscript.toml +++ b/languages/shellscript.toml @@ -17,4 +17,4 @@ install-hint = "npm i -g bash-language-server (optionally install shellcheck and [debugger] adapter = "bash-debug" command = "bash-debug-adapter" -install-hint = "Install https://github.com/rogalmic/vscode-bash-debug as `bash-debug-adapter` (e.g. via mason.nvim)" +install-hint = "Install Bash Debug in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/typescript.toml b/languages/typescript.toml index 951c09223..33bed030f 100644 --- a/languages/typescript.toml +++ b/languages/typescript.toml @@ -69,4 +69,4 @@ adapter = "js-debug" command = "js-debug-adapter" args = ["${port}", "127.0.0.1"] transport = "tcp" -install-hint = "Install vscode-js-debug's DAP server (js-debug-dap-*.tar.gz from https://github.com/microsoft/vscode-js-debug/releases) as `js-debug-adapter`" +install-hint = "Install JavaScript Debugger (vscode-js-debug) in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/typescriptreact.toml b/languages/typescriptreact.toml index 3d4b1377c..ceb0171df 100644 --- a/languages/typescriptreact.toml +++ b/languages/typescriptreact.toml @@ -58,4 +58,4 @@ adapter = "js-debug" command = "js-debug-adapter" args = ["${port}", "127.0.0.1"] transport = "tcp" -install-hint = "Install vscode-js-debug's DAP server (js-debug-dap-*.tar.gz from https://github.com/microsoft/vscode-js-debug/releases) as `js-debug-adapter`" +install-hint = "Install JavaScript Debugger (vscode-js-debug) in Settings › Languages & Frameworks › Language Servers" diff --git a/languages/zig.toml b/languages/zig.toml index b1fe5144f..667cb2b1a 100644 --- a/languages/zig.toml +++ b/languages/zig.toml @@ -16,4 +16,4 @@ adapter = "codelldb" command = "codelldb" args = ["--port", "${port}"] transport = "tcp" -install-hint = "Install the CodeLLDB adapter (https://github.com/vadimcn/codelldb/releases)" +install-hint = "Install CodeLLDB in Settings › Languages & Frameworks › Language Servers" diff --git a/src/features/debugger/__tests__/missingAdapter.test.ts b/src/features/debugger/__tests__/missingAdapter.test.ts index f791778f2..072846ba7 100644 --- a/src/features/debugger/__tests__/missingAdapter.test.ts +++ b/src/features/debugger/__tests__/missingAdapter.test.ts @@ -25,6 +25,9 @@ describe("missing debug adapters", () => { "netcoredbg", ); expect(missingAdapter("delve", unavailable("debug adapter `delve` not found (x)"))?.tool).toBe("delve"); + expect(missingAdapter("bash-debug", unavailable("debug adapter `bash-debug` not found (x)"))?.title).toBe( + "Bash Debug is not installed", + ); }); it("offers the managed install of the missing php-debug adapter", () => { diff --git a/src/features/debugger/missingAdapter.ts b/src/features/debugger/missingAdapter.ts index 357b10b9b..68a676532 100644 --- a/src/features/debugger/missingAdapter.ts +++ b/src/features/debugger/missingAdapter.ts @@ -13,6 +13,7 @@ const INSTALLABLE: Record = { delve: { tool: "delve", title: "Delve is not installed" }, codelldb: { tool: "codelldb", title: "CodeLLDB is not installed" }, "php-debug": { tool: "php-debug", title: "PHP Debug (Xdebug) is not installed" }, + "bash-debug": { tool: "bash-debug", title: "Bash Debug is not installed" }, }; export interface MissingAdapter { diff --git a/src/platform/locales/text/zh.json b/src/platform/locales/text/zh.json index 8064365b4..ec835dae7 100644 --- a/src/platform/locales/text/zh.json +++ b/src/platform/locales/text/zh.json @@ -4127,6 +4127,7 @@ "Delve is not installed": "Delve 未安装", "CodeLLDB is not installed": "CodeLLDB 未安装", "PHP Debug (Xdebug) is not installed": "PHP Debug (Xdebug) 未安装", + "Bash Debug is not installed": "Bash Debug 未安装", "{name} (child)": "{name}（子进程）", "Enable breakpoint at {path}:{line}": "启用位于 {path}:{line} 的断点", "Headers ({count})": "标头 ({count})",