From f16c968cc84fbae730f5745a2929f71d8218e871 Mon Sep 17 00:00:00 2001
From: Christian Howe <cjhowe@google.com>
Date: Sun, 13 Apr 2025 14:31:33 -0700
Subject: [PATCH] remove invalid workspaceFolder prefix from the zed
 rust-analyzer config

---
 src/bootstrap/src/core/build_steps/setup.rs | 1 +
 src/etc/rust_analyzer_zed.json              | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/src/core/build_steps/setup.rs b/src/bootstrap/src/core/build_steps/setup.rs
index 80d92135dd378..2108fbc575b46 100644
--- a/src/bootstrap/src/core/build_steps/setup.rs
+++ b/src/bootstrap/src/core/build_steps/setup.rs
@@ -606,6 +606,7 @@ Select which editor you would like to set up [default: None]: ";
             EditorKind::Zed => &[
                 "bbce727c269d1bd0c98afef4d612eb4ce27aea3c3a8968c5f10b31affbc40b6c",
                 "a5380cf5dd9328731aecc5dfb240d16dac46ed272126b9728006151ef42f5909",
+                "9d6f1f99e8a98467173126fcb480aa8203ea5bdabdb55a903bee03da8307e483".
             ],
         }
     }
diff --git a/src/etc/rust_analyzer_zed.json b/src/etc/rust_analyzer_zed.json
index abc6ddbc213c4..d671fc94cb7fd 100644
--- a/src/etc/rust_analyzer_zed.json
+++ b/src/etc/rust_analyzer_zed.json
@@ -28,15 +28,15 @@
           "compiler/rustc_codegen_gcc/Cargo.toml"
         ],
         "procMacro": {
-            "enable": true,
-            "server": "${workspaceFolder}/build/host/stage0/libexec/rust-analyzer-proc-macro-srv"
+          "enable": true,
+          "server": "build/host/stage0/libexec/rust-analyzer-proc-macro-srv"
         },
         "rustc": {
           "source": "./Cargo.toml"
         },
         "rustfmt": {
           "overrideCommand": [
-            "${workspaceFolder}/build/host/rustfmt/bin/rustfmt",
+            "build/host/rustfmt/bin/rustfmt",
             "--edition=2021"
           ]
         },