Skip to content

Commit 18dbb8f

Browse files
bors[bot]matklad
andauthored
Merge #7164
7164: Allow `#anchor` linking of config options r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
2 parents d21035d + d7741d1 commit 18dbb8f

File tree

2 files changed

+55
-56
lines changed

2 files changed

+55
-56
lines changed

crates/rust-analyzer/src/config.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -777,9 +777,8 @@ fn manual(fields: &[(&'static str, &'static str, &[&str], &str)]) -> String {
777777
fields
778778
.iter()
779779
.map(|(field, _ty, doc, default)| {
780-
let name = field.replace("_", ".");
781-
let name = format!("rust-analyzer.{} (default: `{}`)", name, default);
782-
format!("{}::\n{}\n", name, doc.join(" "))
780+
let name = format!("rust-analyzer.{}", field.replace("_", "."));
781+
format!("[[{}]]{} (default: `{}`)::\n{}\n", name, name, default, doc.join(" "))
783782
})
784783
.collect::<String>()
785784
}

docs/user/generated_config.adoc

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,106 @@
1-
rust-analyzer.assist.importMergeBehaviour (default: `"full"`)::
1+
[[rust-analyzer.assist.importMergeBehaviour]]rust-analyzer.assist.importMergeBehaviour (default: `"full"`)::
22
The strategy to use when inserting new imports or merging imports.
3-
rust-analyzer.assist.importPrefix (default: `"plain"`)::
3+
[[rust-analyzer.assist.importPrefix]]rust-analyzer.assist.importPrefix (default: `"plain"`)::
44
The path structure for newly inserted paths to use.
5-
rust-analyzer.callInfo.full (default: `true`)::
5+
[[rust-analyzer.callInfo.full]]rust-analyzer.callInfo.full (default: `true`)::
66
Show function name and docs in parameter hints.
7-
rust-analyzer.cargo.autoreload (default: `true`)::
7+
[[rust-analyzer.cargo.autoreload]]rust-analyzer.cargo.autoreload (default: `true`)::
88
Automatically refresh project info via `cargo metadata` on `Cargo.toml` changes.
9-
rust-analyzer.cargo.allFeatures (default: `false`)::
9+
[[rust-analyzer.cargo.allFeatures]]rust-analyzer.cargo.allFeatures (default: `false`)::
1010
Activate all available features.
11-
rust-analyzer.cargo.features (default: `[]`)::
11+
[[rust-analyzer.cargo.features]]rust-analyzer.cargo.features (default: `[]`)::
1212
List of features to activate.
13-
rust-analyzer.cargo.loadOutDirsFromCheck (default: `false`)::
13+
[[rust-analyzer.cargo.loadOutDirsFromCheck]]rust-analyzer.cargo.loadOutDirsFromCheck (default: `false`)::
1414
Run `cargo check` on startup to get the correct value for package OUT_DIRs.
15-
rust-analyzer.cargo.noDefaultFeatures (default: `false`)::
15+
[[rust-analyzer.cargo.noDefaultFeatures]]rust-analyzer.cargo.noDefaultFeatures (default: `false`)::
1616
Do not activate the `default` feature.
17-
rust-analyzer.cargo.target (default: `null`)::
17+
[[rust-analyzer.cargo.target]]rust-analyzer.cargo.target (default: `null`)::
1818
Compilation target (target triple).
19-
rust-analyzer.cargo.noSysroot (default: `false`)::
19+
[[rust-analyzer.cargo.noSysroot]]rust-analyzer.cargo.noSysroot (default: `false`)::
2020
Internal config for debugging, disables loading of sysroot crates.
21-
rust-analyzer.checkOnSave.enable (default: `true`)::
21+
[[rust-analyzer.checkOnSave.enable]]rust-analyzer.checkOnSave.enable (default: `true`)::
2222
Run specified `cargo check` command for diagnostics on save.
23-
rust-analyzer.checkOnSave.allFeatures (default: `null`)::
23+
[[rust-analyzer.checkOnSave.allFeatures]]rust-analyzer.checkOnSave.allFeatures (default: `null`)::
2424
Check with all features (will be passed as `--all-features`). Defaults to `#rust-analyzer.cargo.allFeatures#`.
25-
rust-analyzer.checkOnSave.allTargets (default: `true`)::
25+
[[rust-analyzer.checkOnSave.allTargets]]rust-analyzer.checkOnSave.allTargets (default: `true`)::
2626
Check all targets and tests (will be passed as `--all-targets`).
27-
rust-analyzer.checkOnSave.command (default: `"check"`)::
27+
[[rust-analyzer.checkOnSave.command]]rust-analyzer.checkOnSave.command (default: `"check"`)::
2828
Cargo command to use for `cargo check`.
29-
rust-analyzer.checkOnSave.noDefaultFeatures (default: `null`)::
29+
[[rust-analyzer.checkOnSave.noDefaultFeatures]]rust-analyzer.checkOnSave.noDefaultFeatures (default: `null`)::
3030
Do not activate the `default` feature.
31-
rust-analyzer.checkOnSave.target (default: `null`)::
31+
[[rust-analyzer.checkOnSave.target]]rust-analyzer.checkOnSave.target (default: `null`)::
3232
Check for a specific target. Defaults to `#rust-analyzer.cargo.target#`.
33-
rust-analyzer.checkOnSave.extraArgs (default: `[]`)::
33+
[[rust-analyzer.checkOnSave.extraArgs]]rust-analyzer.checkOnSave.extraArgs (default: `[]`)::
3434
Extra arguments for `cargo check`.
35-
rust-analyzer.checkOnSave.features (default: `null`)::
35+
[[rust-analyzer.checkOnSave.features]]rust-analyzer.checkOnSave.features (default: `null`)::
3636
List of features to activate. Defaults to `#rust-analyzer.cargo.features#`.
37-
rust-analyzer.checkOnSave.overrideCommand (default: `null`)::
37+
[[rust-analyzer.checkOnSave.overrideCommand]]rust-analyzer.checkOnSave.overrideCommand (default: `null`)::
3838
Advanced option, fully override the command rust-analyzer uses for checking. The command should include `--message-format=json` or similar option.
39-
rust-analyzer.completion.addCallArgumentSnippets (default: `true`)::
39+
[[rust-analyzer.completion.addCallArgumentSnippets]]rust-analyzer.completion.addCallArgumentSnippets (default: `true`)::
4040
Whether to add argument snippets when completing functions.
41-
rust-analyzer.completion.addCallParenthesis (default: `true`)::
41+
[[rust-analyzer.completion.addCallParenthesis]]rust-analyzer.completion.addCallParenthesis (default: `true`)::
4242
Whether to add parenthesis when completing functions.
43-
rust-analyzer.completion.postfix.enable (default: `true`)::
43+
[[rust-analyzer.completion.postfix.enable]]rust-analyzer.completion.postfix.enable (default: `true`)::
4444
Whether to show postfix snippets like `dbg`, `if`, `not`, etc.
45-
rust-analyzer.completion.autoimport.enable (default: `true`)::
45+
[[rust-analyzer.completion.autoimport.enable]]rust-analyzer.completion.autoimport.enable (default: `true`)::
4646
Toggles the additional completions that automatically add imports when completed. Note that your client must specify the `additionalTextEdits` LSP client capability to truly have this feature enabled.
47-
rust-analyzer.diagnostics.enable (default: `true`)::
47+
[[rust-analyzer.diagnostics.enable]]rust-analyzer.diagnostics.enable (default: `true`)::
4848
Whether to show native rust-analyzer diagnostics.
49-
rust-analyzer.diagnostics.enableExperimental (default: `true`)::
49+
[[rust-analyzer.diagnostics.enableExperimental]]rust-analyzer.diagnostics.enableExperimental (default: `true`)::
5050
Whether to show experimental rust-analyzer diagnostics that might have more false positives than usual.
51-
rust-analyzer.diagnostics.disabled (default: `[]`)::
51+
[[rust-analyzer.diagnostics.disabled]]rust-analyzer.diagnostics.disabled (default: `[]`)::
5252
List of rust-analyzer diagnostics to disable.
53-
rust-analyzer.diagnostics.warningsAsHint (default: `[]`)::
53+
[[rust-analyzer.diagnostics.warningsAsHint]]rust-analyzer.diagnostics.warningsAsHint (default: `[]`)::
5454
List of warnings that should be displayed with info severity.\n\nThe warnings will be indicated by a blue squiggly underline in code and a blue icon in the `Problems Panel`.
55-
rust-analyzer.diagnostics.warningsAsInfo (default: `[]`)::
55+
[[rust-analyzer.diagnostics.warningsAsInfo]]rust-analyzer.diagnostics.warningsAsInfo (default: `[]`)::
5656
List of warnings that should be displayed with hint severity.\n\nThe warnings will be indicated by faded text or three dots in code and will not show up in the `Problems Panel`.
57-
rust-analyzer.files.watcher (default: `"client"`)::
57+
[[rust-analyzer.files.watcher]]rust-analyzer.files.watcher (default: `"client"`)::
5858
Controls file watching implementation.
59-
rust-analyzer.hoverActions.debug (default: `true`)::
59+
[[rust-analyzer.hoverActions.debug]]rust-analyzer.hoverActions.debug (default: `true`)::
6060
Whether to show `Debug` action. Only applies when `#rust-analyzer.hoverActions.enable#` is set.
61-
rust-analyzer.hoverActions.enable (default: `true`)::
61+
[[rust-analyzer.hoverActions.enable]]rust-analyzer.hoverActions.enable (default: `true`)::
6262
Whether to show HoverActions in Rust files.
63-
rust-analyzer.hoverActions.gotoTypeDef (default: `true`)::
63+
[[rust-analyzer.hoverActions.gotoTypeDef]]rust-analyzer.hoverActions.gotoTypeDef (default: `true`)::
6464
Whether to show `Go to Type Definition` action. Only applies when `#rust-analyzer.hoverActions.enable#` is set.
65-
rust-analyzer.hoverActions.implementations (default: `true`)::
65+
[[rust-analyzer.hoverActions.implementations]]rust-analyzer.hoverActions.implementations (default: `true`)::
6666
Whether to show `Implementations` action. Only applies when `#rust-analyzer.hoverActions.enable#` is set.
67-
rust-analyzer.hoverActions.run (default: `true`)::
67+
[[rust-analyzer.hoverActions.run]]rust-analyzer.hoverActions.run (default: `true`)::
6868
Whether to show `Run` action. Only applies when `#rust-analyzer.hoverActions.enable#` is set.
69-
rust-analyzer.hoverActions.linksInHover (default: `true`)::
69+
[[rust-analyzer.hoverActions.linksInHover]]rust-analyzer.hoverActions.linksInHover (default: `true`)::
7070
Use markdown syntax for links in hover.
71-
rust-analyzer.inlayHints.chainingHints (default: `true`)::
71+
[[rust-analyzer.inlayHints.chainingHints]]rust-analyzer.inlayHints.chainingHints (default: `true`)::
7272
Whether to show inlay type hints for method chains.
73-
rust-analyzer.inlayHints.maxLength (default: `null`)::
73+
[[rust-analyzer.inlayHints.maxLength]]rust-analyzer.inlayHints.maxLength (default: `null`)::
7474
Maximum length for inlay hints. Default is unlimited.
75-
rust-analyzer.inlayHints.parameterHints (default: `true`)::
75+
[[rust-analyzer.inlayHints.parameterHints]]rust-analyzer.inlayHints.parameterHints (default: `true`)::
7676
Whether to show function parameter name inlay hints at the call site.
77-
rust-analyzer.inlayHints.typeHints (default: `true`)::
77+
[[rust-analyzer.inlayHints.typeHints]]rust-analyzer.inlayHints.typeHints (default: `true`)::
7878
Whether to show inlay type hints for variables.
79-
rust-analyzer.lens.debug (default: `true`)::
79+
[[rust-analyzer.lens.debug]]rust-analyzer.lens.debug (default: `true`)::
8080
Whether to show `Debug` lens. Only applies when `#rust-analyzer.lens.enable#` is set.
81-
rust-analyzer.lens.enable (default: `true`)::
81+
[[rust-analyzer.lens.enable]]rust-analyzer.lens.enable (default: `true`)::
8282
Whether to show CodeLens in Rust files.
83-
rust-analyzer.lens.implementations (default: `true`)::
83+
[[rust-analyzer.lens.implementations]]rust-analyzer.lens.implementations (default: `true`)::
8484
Whether to show `Implementations` lens. Only applies when `#rust-analyzer.lens.enable#` is set.
85-
rust-analyzer.lens.run (default: `true`)::
85+
[[rust-analyzer.lens.run]]rust-analyzer.lens.run (default: `true`)::
8686
Whether to show `Run` lens. Only applies when `#rust-analyzer.lens.enable#` is set.
87-
rust-analyzer.lens.methodReferences (default: `false`)::
87+
[[rust-analyzer.lens.methodReferences]]rust-analyzer.lens.methodReferences (default: `false`)::
8888
Whether to show `Method References` lens. Only applies when `#rust-analyzer.lens.enable#` is set.
89-
rust-analyzer.linkedProjects (default: `[]`)::
89+
[[rust-analyzer.linkedProjects]]rust-analyzer.linkedProjects (default: `[]`)::
9090
Disable project auto-discovery in favor of explicitly specified set of projects.\n\nElements must be paths pointing to `Cargo.toml`, `rust-project.json`, or JSON objects in `rust-project.json` format.
91-
rust-analyzer.lruCapacity (default: `null`)::
91+
[[rust-analyzer.lruCapacity]]rust-analyzer.lruCapacity (default: `null`)::
9292
Number of syntax trees rust-analyzer keeps in memory. Defaults to 128.
93-
rust-analyzer.notifications.cargoTomlNotFound (default: `true`)::
93+
[[rust-analyzer.notifications.cargoTomlNotFound]]rust-analyzer.notifications.cargoTomlNotFound (default: `true`)::
9494
Whether to show `can't find Cargo.toml` error message.
95-
rust-analyzer.procMacro.enable (default: `false`)::
95+
[[rust-analyzer.procMacro.enable]]rust-analyzer.procMacro.enable (default: `false`)::
9696
Enable Proc macro support, `#rust-analyzer.cargo.loadOutDirsFromCheck#` must be enabled.
97-
rust-analyzer.runnables.overrideCargo (default: `null`)::
97+
[[rust-analyzer.runnables.overrideCargo]]rust-analyzer.runnables.overrideCargo (default: `null`)::
9898
Command to be executed instead of 'cargo' for runnables.
99-
rust-analyzer.runnables.cargoExtraArgs (default: `[]`)::
99+
[[rust-analyzer.runnables.cargoExtraArgs]]rust-analyzer.runnables.cargoExtraArgs (default: `[]`)::
100100
Additional arguments to be passed to cargo for runnables such as tests or binaries.\nFor example, it may be `--release`.
101-
rust-analyzer.rustcSource (default: `null`)::
101+
[[rust-analyzer.rustcSource]]rust-analyzer.rustcSource (default: `null`)::
102102
Path to the rust compiler sources, for usage in rustc_private projects.
103-
rust-analyzer.rustfmt.extraArgs (default: `[]`)::
103+
[[rust-analyzer.rustfmt.extraArgs]]rust-analyzer.rustfmt.extraArgs (default: `[]`)::
104104
Additional arguments to `rustfmt`.
105-
rust-analyzer.rustfmt.overrideCommand (default: `null`)::
105+
[[rust-analyzer.rustfmt.overrideCommand]]rust-analyzer.rustfmt.overrideCommand (default: `null`)::
106106
Advanced option, fully override the command rust-analyzer uses for formatting.

0 commit comments

Comments
 (0)