From 490c9ef7fe0614374b627c746e6bd5d990a82bbc Mon Sep 17 00:00:00 2001
From: Deadbeef <ent3rm4n@gmail.com>
Date: Fri, 15 Apr 2022 23:13:21 +1000
Subject: [PATCH] Update suggested config to expand proc macros

---
 src/building/suggested.md | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/building/suggested.md b/src/building/suggested.md
index a6ff65db3c..9a4a55e12f 100644
--- a/src/building/suggested.md
+++ b/src/building/suggested.md
@@ -32,14 +32,22 @@ you can write: <!-- date: 2022-04 --><!-- the date comment is for the edition be
         "check",
         "--json-output"
     ],
+    "rust-analyzer.cargo.runBuildScriptsCommand": [
+        "cargo",
+        "check",
+        "-p",
+        "rustc_driver",
+        "--message-format=json"
+    ],
     "rust-analyzer.rustfmt.overrideCommand": [
         "./build/$TARGET_TRIPLE/stage0/bin/rustfmt",
         "--edition=2021"
     ],
     "editor.formatOnSave": true,
-    "rust-analyzer.cargo.runBuildScripts": false,
+    "rust-analyzer.cargo.runBuildScripts": true,
     "rust-analyzer.rustcSource": "./Cargo.toml",
-    "rust-analyzer.procMacro.enable": false
+    "rust-analyzer.procMacro.enable": true,
+    "rust-analyzer.cargo.useRustcWrapperForBuildScripts": true
 }
 ```
 
@@ -56,6 +64,14 @@ If you're running `coc.nvim`, you can use `:CocLocalConfig` to create a
 `editor.formatOnSave: true,` with
 `"coc.preferences.formatOnSaveFiletypes": ["rust"],`.
 
+> NOTE: The configuration once suggested disabling build scripts, but after
+> the version `2022-04-14` this was fixed by introducing an option for customizing
+> the command rust-analyzer uses to run build scripts. Please ensure that `rust-analyzer`
+> is up to date before enabling these options. If you do not wish to enable
+> `rust-analyzer.cargo.useRustcWrapperForBuildScripts`, the
+> `rust-analyzer.cargo.runBuildScriptsCommand` option should be set as same as
+> `rust-analyzer.checkOnSave.overrideCommand` instead of the suggested value.
+
 If running `./x.py check` on save is inconvenient, in VS Code you can use a [Build
 Task] instead: