Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adjust config name

Browse source
This commit is contained in:
Lukas Wirth 2022-01-06 13:44:21 +01:00
parent dd4b53402d
commit f6eba28ef8
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/rust-analyzer/src/config.rs
View file

@ -301,9 +301,10 @@ config_data! {
/// Internal config, path to proc-macro server executable (typically, /// Internal config, path to proc-macro server executable (typically,
/// this is rust-analyzer itself, but we override this in tests). /// this is rust-analyzer itself, but we override this in tests).
procMacro_server: Option<PathBuf> = "null", procMacro_server: Option<PathBuf> = "null",
/// Replaces the proc-macro expanders for the named proc-macros in the named crates with /// These proc-macros will be ignored when trying to expand them.
/// an identity expander that outputs the input again. ///
procMacro_dummies: FxHashMap<Box<str>, Box<[Box<str>]>> = "{}", /// This config takes a map of crate names with the exported proc-macro names to ignore as values.
procMacro_ignored: FxHashMap<Box<str>, Box<[Box<str>]>> = "{}",
/// Command to be executed instead of 'cargo' for runnables. /// Command to be executed instead of 'cargo' for runnables.
runnables_overrideCargo: Option<String> = "null", runnables_overrideCargo: Option<String> = "null",
@ -720,7 +721,7 @@ impl Config {
Some((path, vec!["proc-macro".into()])) Some((path, vec!["proc-macro".into()]))
} }
pub fn dummy_replacements(&self) -> &FxHashMap<Box<str>, Box<[Box<str>]>> { pub fn dummy_replacements(&self) -> &FxHashMap<Box<str>, Box<[Box<str>]>> {
&self.data.procMacro_dummies &self.data.procMacro_ignored
} }
pub fn expand_proc_attr_macros(&self) -> bool { pub fn expand_proc_attr_macros(&self) -> bool {
self.data.experimental_procAttrMacros self.data.experimental_procAttrMacros

7
docs/user/generated_config.adoc
View file

@ -455,11 +455,12 @@ Enable support for procedural macros, implies `#rust-analyzer.cargo.runBuildScri
Internal config, path to proc-macro server executable (typically, Internal config, path to proc-macro server executable (typically,
this is rust-analyzer itself, but we override this in tests). this is rust-analyzer itself, but we override this in tests).
-- --
[[rust-analyzer.procMacro.dummies]]rust-analyzer.procMacro.dummies (default: `{}`):: [[rust-analyzer.procMacro.ignored]]rust-analyzer.procMacro.ignored (default: `{}`)::
+ +
-- --
Replaces the proc-macro expanders for the named proc-macros in the named crates with These proc-macros will be ignored when trying to expand them.
an identity expander that outputs the input again.
This config takes a map of crate names with the exported proc-macro names to ignore as values.
-- --
[[rust-analyzer.runnables.overrideCargo]]rust-analyzer.runnables.overrideCargo (default: `null`):: [[rust-analyzer.runnables.overrideCargo]]rust-analyzer.runnables.overrideCargo (default: `null`)::
+ +

4
editors/code/package.json
View file

@ -880,8 +880,8 @@
"string" "string"
] ]
}, },
"rust-analyzer.procMacro.dummies": { "rust-analyzer.procMacro.ignored": {
"markdownDescription": "Replaces the proc-macro expanders for the named proc-macros in the named crates with\nan identity expander that outputs the input again.", "markdownDescription": "These proc-macros will be ignored when trying to expand them.\n\nThis config takes a map of crate names with the exported proc-macro names to ignore as values.",
"default": {}, "default": {},
"type": "object" "type": "object"
}, },