Skip to content

Commit dedd99f

Browse files
committed
tweak helix config
1 parent 07ee583 commit dedd99f

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/bootstrap/src/core/build_steps/setup.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,7 @@ Select which editor you would like to set up [default: None]: ";
596596
"198c195ed0c070d15907b279b8b4ea96198ca71b939f5376454f3d636ab54da5",
597597
"1c43ead340b20792b91d02b08494ee68708e7e09f56b6766629b4b72079208f1",
598598
"eec09a09452682060afd23dd5d3536ccac5615b3cdbf427366446901215fb9f6",
599+
"d3fbf8eca90f7e12a3609988ba2e7e5ba0c03c15d9d64344cde5147eb80fee69",
599600
],
600601
EditorKind::Vim | EditorKind::VsCode => &[
601602
"ea67e259dedf60d4429b6c349a564ffcd1563cf41c920a856d1f5b16b4701ac8",

src/etc/rust_analyzer_helix.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
# so that r-a's checks don't block user `x` commands and vice-verse.
33
# R-a's build directory is located in `build-rust-analyzer`.
44
#
5-
# To build rustfmt and proc macro server for r-a run the following command:
5+
# To download rustfmt and proc macro server for r-a run the following command
6+
# (proc macro server is downloaded automatically with pretty much any command,
7+
# this specific one also downloads rustfmt):
68
# ```
7-
# x b proc-macro-srv-cli rustfmt --stage 0 --build-dir build-rust-analyzer
9+
# x fmt --check
810
# ```
11+
# (if that doesn't work -- do `x clean` first)
912

1013
[language-server.rust-analyzer.config]
1114
linkedProjects = [
@@ -18,7 +21,6 @@ linkedProjects = [
1821
]
1922

2023
[language-server.rust-analyzer.config.check]
21-
invocationLocation = "root"
2224
invocationStrategy = "once"
2325
overrideCommand = [
2426
"python3",
@@ -31,12 +33,12 @@ overrideCommand = [
3133

3234
[language-server.rust-analyzer.config.rustfmt]
3335
overrideCommand = [
34-
"build-rust-analyzer/host/rustfmt/bin/rustfmt",
36+
"build/host/rustfmt/bin/rustfmt",
3537
"--edition=2024"
3638
]
3739

3840
[language-server.rust-analyzer.config.procMacro]
39-
server = "build-rust-analyzer/host/stage0/libexec/rust-analyzer-proc-macro-srv"
41+
server = "build/host/stage0/libexec/rust-analyzer-proc-macro-srv"
4042
enable = true
4143

4244
[language-server.rust-analyzer.config.rustc]
@@ -50,14 +52,13 @@ RUSTC_BOOTSTRAP = "1"
5052

5153
[language-server.rust-analyzer.config.cargo.buildScripts]
5254
enable = true
53-
invocationLocation = "root"
5455
invocationStrategy = "once"
5556
overrideCommand = [
5657
"python3",
5758
"x.py",
5859
"check",
5960
"--json-output",
61+
"--compile-time-deps",
6062
"--build-dir",
6163
"build-rust-analyzer",
62-
"--compile-time-deps",
6364
]

0 commit comments

Comments
 (0)