synchronize helix/zed/vscode settings

Author: WaffleLapkin

src/etc/rust_analyzer_eglot.el

@@ -1,8 +1,7 @@
 ((rustic-mode
   .((eglot-workspace-configuration
      . (:rust-analyzer
-        ( :check ( :invocationLocation "root"
-                                       :invocationStrategy "once"
+        ( :check ( :invocationStrategy "once"
                                        :overrideCommand ["python3"
                                                          "x.py"
                                                          "check"

src/etc/rust_analyzer_helix.toml

@@ -62,3 +62,10 @@ overrideCommand = [
     "--build-dir",
     "build-rust-analyzer",
 ]
+
+[language-server.rust-analyzer.environment]
+RUSTUP_TOOLCHAIN = "nightly"
+
+[[language]]
+name = "rust"
+file-types = ["rs", "fixed", "pp", "mir"]

src/etc/rust_analyzer_settings.json

@@ -1,14 +1,5 @@
 {
     "git.detectSubmodulesLimit": 20,
-    "rust-analyzer.check.invocationStrategy": "once",
-    "rust-analyzer.check.overrideCommand": [
-        "python3",
-        "x.py",
-        "check",
-        "--build-dir",
-        "build-rust-analyzer",
-        "--json-output"
-    ],
     "rust-analyzer.linkedProjects": [
         "Cargo.toml",
         "compiler/rustc_codegen_cranelift/Cargo.toml",
@@ -17,28 +8,37 @@
         "src/bootstrap/Cargo.toml",
         "src/tools/rust-analyzer/Cargo.toml"
     ],
+    "rust-analyzer.check.invocationStrategy": "once",
+    "rust-analyzer.check.overrideCommand": [
+        "python3",
+        "x.py",
+        "check",
+        "--json-output",
+        "--build-dir",
+        "build-rust-analyzer"
+    ],
     "rust-analyzer.rustfmt.overrideCommand": [
-        "${workspaceFolder}/build-rust-analyzer/host/rustfmt/bin/rustfmt",
+        "${workspaceFolder}/build/host/rustfmt/bin/rustfmt",
         "--edition=2024"
     ],
-    "rust-analyzer.procMacro.server": "${workspaceFolder}/build-rust-analyzer/host/stage0/libexec/rust-analyzer-proc-macro-srv",
+    "rust-analyzer.procMacro.server": "${workspaceFolder}/build/host/stage0/libexec/rust-analyzer-proc-macro-srv",
     "rust-analyzer.procMacro.enable": true,
+    "rust-analyzer.rustc.source": "./Cargo.toml",
+    "rust-analyzer.cargo.sysrootSrc": "./library",
+    "rust-analyzer.cargo.extraEnv": {
+        "RUSTC_BOOTSTRAP": "1"
+    },
     "rust-analyzer.cargo.buildScripts.enable": true,
     "rust-analyzer.cargo.buildScripts.invocationStrategy": "once",
     "rust-analyzer.cargo.buildScripts.overrideCommand": [
         "python3",
         "x.py",
         "check",
-        "--build-dir",
-        "build-rust-analyzer",
         "--json-output",
         "--compile-time-deps"
+        "--build-dir",
+        "build-rust-analyzer",
     ],
-    "rust-analyzer.cargo.sysrootSrc": "./library",
-    "rust-analyzer.rustc.source": "./Cargo.toml",
-    "rust-analyzer.cargo.extraEnv": {
-        "RUSTC_BOOTSTRAP": "1"
-    },
     "rust-analyzer.server.extraEnv": {
         "RUSTUP_TOOLCHAIN": "nightly"
     },

src/etc/rust_analyzer_zed.json

@@ -2,28 +2,15 @@
   "lsp": {
     "rust-analyzer": {
       "initialization_options": {
-        "cargo": {
-          "buildScripts": {
-            "enable": true,
-            "invocationLocation": "root",
-            "invocationStrategy": "once",
-            "overrideCommand": [
-              "python3",
-              "x.py",
-              "check",
-              "--build-dir",
-              "build-rust-analyzer",
-              "--compile-time-deps",
-              "--json-output"
-            ]
-          },
-          "extraEnv": {
-            "RUSTC_BOOTSTRAP": "1"
-          },
-          "sysrootSrc": "./library"
-        },
+        "linkedProjects": [
+          "Cargo.toml",
+          "compiler/rustc_codegen_cranelift/Cargo.toml",
+          "compiler/rustc_codegen_gcc/Cargo.toml",
+          "library/Cargo.toml",
+          "src/bootstrap/Cargo.toml",
+          "src/tools/rust-analyzer/Cargo.toml"
+        ],
         "check": {
-          "invocationLocation": "root",
           "invocationStrategy": "once",
           "overrideCommand": [
             "python3",
@@ -34,26 +21,37 @@
             "build-rust-analyzer"
           ]
         },
-        "linkedProjects": [
-          "Cargo.toml",
-          "compiler/rustc_codegen_cranelift/Cargo.toml",
-          "compiler/rustc_codegen_gcc/Cargo.toml",
-          "library/Cargo.toml",
-          "src/bootstrap/Cargo.toml",
-          "src/tools/rust-analyzer/Cargo.toml"
-        ],
+        "rustfmt": {
+          "overrideCommand": [
+            "build/host/rustfmt/bin/rustfmt",
+            "--edition=2024"
+          ]
+        },
         "procMacro": {
           "enable": true,
-          "server": "build-rust-analyzer/host/stage0/libexec/rust-analyzer-proc-macro-srv"
+          "server": "build/host/stage0/libexec/rust-analyzer-proc-macro-srv"
         },
         "rustc": {
           "source": "./Cargo.toml"
         },
-        "rustfmt": {
-          "overrideCommand": [
-            "build-rust-analyzer/host/rustfmt/bin/rustfmt",
-            "--edition=2024"
-          ]
+        "cargo": {
+          "sysrootSrc": "./library",
+          "extraEnv": {
+            "RUSTC_BOOTSTRAP": "1"
+          },
+          "buildScripts": {
+            "enable": true,
+            "invocationStrategy": "once",
+            "overrideCommand": [
+              "python3",
+              "x.py",
+              "check",
+              "--json-output"
+              "--compile-time-deps",
+              "--build-dir",
+              "build-rust-analyzer",
+            ]
+          }
         },
         "server": {
           "extraEnv": {