Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/rust-analyzer/src/config.rs | 10 | ||||
| -rw-r--r-- | docs/book/src/configuration_generated.md | 16 | ||||
| -rw-r--r-- | editors/code/package.json | 28 |
3 files changed, 27 insertions, 27 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 015e6df96f..98495f6150 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -387,14 +387,14 @@ config_data! { /// Enable support for procedural macros, implies `#rust-analyzer.cargo.buildScripts.enable#`. procMacro_enable: bool = true, - /// Internal config, path to proc-macro server executable. - procMacro_server: Option<Utf8PathBuf> = None, - /// Number of proc-macro server processes to spawn. /// /// Controls how many independent `proc-macro-srv` processes rust-analyzer /// runs in parallel to handle macro expansion. - proc_macro_processes: NumProcesses = NumProcesses::Concrete(1), + procMacro_processes: NumProcesses = NumProcesses::Concrete(1), + + /// Internal config, path to proc-macro server executable. + procMacro_server: Option<Utf8PathBuf> = None, /// The path where to save memory profiling output. /// @@ -2648,7 +2648,7 @@ impl Config { } pub fn proc_macro_num_processes(&self) -> usize { - match self.proc_macro_processes() { + match self.procMacro_processes() { NumProcesses::Concrete(0) | NumProcesses::Physical => num_cpus::get_physical(), &NumProcesses::Concrete(n) => n, } diff --git a/docs/book/src/configuration_generated.md b/docs/book/src/configuration_generated.md index d3f41fb152..5b1a2e1111 100644 --- a/docs/book/src/configuration_generated.md +++ b/docs/book/src/configuration_generated.md @@ -1318,14 +1318,7 @@ These proc-macros will be ignored when trying to expand them. This config takes a map of crate names with the exported proc-macro names to ignore as values. -## rust-analyzer.procMacro.server {#procMacro.server} - -Default: `null` - -Internal config, path to proc-macro server executable. - - -## rust-analyzer.proc.macro.processes {#proc.macro.processes} +## rust-analyzer.procMacro.processes {#procMacro.processes} Default: `1` @@ -1335,6 +1328,13 @@ Controls how many independent `proc-macro-srv` processes rust-analyzer runs in parallel to handle macro expansion. +## rust-analyzer.procMacro.server {#procMacro.server} + +Default: `null` + +Internal config, path to proc-macro server executable. + + ## rust-analyzer.profiling.memoryProfile {#profiling.memoryProfile} Default: `null` diff --git a/editors/code/package.json b/editors/code/package.json index a1266c4a67..406e41767f 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -2773,20 +2773,7 @@ { "title": "Proc Macro", "properties": { - "rust-analyzer.procMacro.server": { - "markdownDescription": "Internal config, path to proc-macro server executable.", - "default": null, - "type": [ - "null", - "string" - ] - } - } - }, - { - "title": "Proc", - "properties": { - "rust-analyzer.proc.macro.processes": { + "rust-analyzer.procMacro.processes": { "markdownDescription": "Number of proc-macro server processes to spawn.\n\nControls how many independent `proc-macro-srv` processes rust-analyzer\nruns in parallel to handle macro expansion.", "default": 1, "anyOf": [ @@ -2809,6 +2796,19 @@ } }, { + "title": "Proc Macro", + "properties": { + "rust-analyzer.procMacro.server": { + "markdownDescription": "Internal config, path to proc-macro server executable.", + "default": null, + "type": [ + "null", + "string" + ] + } + } + }, + { "title": "Profiling", "properties": { "rust-analyzer.profiling.memoryProfile": { |