From 21020919e35fc1a973edfe800f921803009d6e2d Mon Sep 17 00:00:00 2001 From: Ali Bektas Date: Thu, 18 Jan 2024 12:09:23 +0100 Subject: [PATCH] v2 --- crates/rust-analyzer/src/config.rs | 7 ++++--- docs/user/generated_config.adoc | 4 ++-- editors/code/package.json | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index b8c9ae3d11a..75229a4d06b 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -494,8 +494,9 @@ config_data! { /// Exclude imports from find-all-references. references_excludeImports: bool = "false", - /// Allow renaming of items not belonging to any workspace crates. - renameExternalItems_enable : bool = "false", + /// Allow renaming of items not belonging to the loaded workspaces. + rename_allowExternalItems: bool = "false", + /// Command to be executed instead of 'cargo' for runnables. runnables_command: Option = "null", @@ -1743,7 +1744,7 @@ impl Config { } pub fn rename(&self) -> bool { - self.data.renameExternalItems_enable + self.data.rename_allowExternalItems } // FIXME: VSCode seems to work wrong sometimes, see https://github.com/microsoft/vscode/issues/193124 diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc index 3eb65166b95..f887bb9df31 100644 --- a/docs/user/generated_config.adoc +++ b/docs/user/generated_config.adoc @@ -777,10 +777,10 @@ Internal config, path to proc-macro server executable. -- Exclude imports from find-all-references. -- -[[rust-analyzer.renameExternalItems.enable]]rust-analyzer.renameExternalItems.enable (default: `false`):: +[[rust-analyzer.rename.allowExternalItems]]rust-analyzer.rename.allowExternalItems (default: `false`):: + -- -Allow renaming of items not belonging to any workspace crates. +Allow renaming of items not belonging to the loaded workspaces. -- [[rust-analyzer.runnables.command]]rust-analyzer.runnables.command (default: `null`):: + diff --git a/editors/code/package.json b/editors/code/package.json index 2ace7569996..58b7da921af 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -1503,8 +1503,8 @@ "default": false, "type": "boolean" }, - "rust-analyzer.renameExternalItems.enable": { - "markdownDescription": "Allow renaming of items not belonging to any workspace crates.", + "rust-analyzer.rename.allowExternalItems": { + "markdownDescription": "Allow renaming of items not belonging to the loaded workspaces.", "default": false, "type": "boolean" },