From a6e40769af26885033da5bc4411136efa5405fe5 Mon Sep 17 00:00:00 2001
From: UebelAndre <github@uebelandre.com>
Date: Mon, 3 Aug 2026 11:55:49 -0700
Subject: [PATCH] Fix rust-analyzer helix config

---
 tools/rust_analyzer/bin/setup.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/rust_analyzer/bin/setup.rs b/tools/rust_analyzer/bin/setup.rs
index 70bad8a34a..94c424acf8 100644
--- a/tools/rust_analyzer/bin/setup.rs
+++ b/tools/rust_analyzer/bin/setup.rs
@@ -1107,22 +1107,22 @@ const NEOVIM_LUA_RUSTFMT: &str = r#"      rustfmt = {
 const HELIX_TOML_TEMPLATE: &str = r#"[language-server.rust-analyzer]
 command = "__RA_LAUNCHER__"
 
-[language-server.rust-analyzer.config.rust-analyzer.workspace.discoverConfig]
+[language-server.rust-analyzer.config.workspace.discoverConfig]
 command = ["__DISCOVER_LAUNCHER__", "{arg}"]
 progressLabel = "rules_rust"
 filesToWatch = ["BUILD", "BUILD.bazel", "MODULE.bazel", "WORKSPACE", "WORKSPACE.bazel"]
 __OPT_PROC_MACRO____OPT_RUSTFMT__
-[language-server.rust-analyzer.config.rust-analyzer.lens]
+[language-server.rust-analyzer.config.lens]
 enable = true
 "#;
 
 const HELIX_TOML_PROC_MACRO: &str = r#"
-[language-server.rust-analyzer.config.rust-analyzer.procMacro]
+[language-server.rust-analyzer.config.procMacro]
 server = "__PMS_LAUNCHER__"
 "#;
 
 const HELIX_TOML_RUSTFMT: &str = r#"
-[language-server.rust-analyzer.config.rust-analyzer.rustfmt]
+[language-server.rust-analyzer.config.rustfmt]
 overrideCommand = ["__RUSTFMT_LAUNCHER__"]
 "#;
 
@@ -1658,9 +1658,8 @@ mod tests {
             .join(LAUNCHER_SUBDIR);
         let snippet = generate_helix_toml(&ctx, &launcher_dir);
         assert!(snippet.contains("[language-server.rust-analyzer]"));
-        assert!(snippet.contains(
-            "[language-server.rust-analyzer.config.rust-analyzer.workspace.discoverConfig]"
-        ));
+        assert!(snippet
+            .contains("[language-server.rust-analyzer.config.workspace.discoverConfig]"));
         // rust-analyzer LSP path comes from the toolchain.
         assert!(snippet.contains("/obase/external/ra/rust-analyzer"));
         // discover sits next to the helix-specific launcher dir.