Add a new config to allow renaming of non-local items

With #15656 we started disallowing renaming of non-local items.
Although this makes sense there are some false positives that
impacted users' workflows. So this config aims to mitigate this
by giving users the liberty to disable this feature.
This commit is contained in:
Ali Bektas 2024-01-17 18:02:41 +01:00
parent 5b62ebc23f
commit 9bd9a17ce5
8 changed files with 65 additions and 17 deletions

View file

@ -71,14 +71,17 @@ impl Definition {
&self, &self,
sema: &Semantics<'_, RootDatabase>, sema: &Semantics<'_, RootDatabase>,
new_name: &str, new_name: &str,
rename_external: bool,
) -> Result<SourceChange> { ) -> Result<SourceChange> {
// self.krate() returns None if // self.krate() returns None if
// self is a built-in attr, built-in type or tool module. // self is a built-in attr, built-in type or tool module.
// it is not allowed for these defs to be renamed. // it is not allowed for these defs to be renamed.
// cases where self.krate() is None is handled below. // cases where self.krate() is None is handled below.
if let Some(krate) = self.krate(sema.db) { if let Some(krate) = self.krate(sema.db) {
if !krate.origin(sema.db).is_local() { // Can we not rename non-local items?
bail!("Cannot rename a non-local definition.") // Then bail if non-local
if !rename_external && !krate.origin(sema.db).is_local() {
bail!("Cannot rename a non-local definition. Set `renameExternalItems` to `true` to allow renaming for this item.")
} }
} }

View file

@ -43,7 +43,7 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::IncorrectCase) -> Option<Vec<Ass
let label = format!("Rename to {}", d.suggested_text); let label = format!("Rename to {}", d.suggested_text);
let mut res = unresolved_fix("change_case", &label, frange.range); let mut res = unresolved_fix("change_case", &label, frange.range);
if ctx.resolve.should_resolve(&res.id) { if ctx.resolve.should_resolve(&res.id) {
let source_change = def.rename(&ctx.sema, &d.suggested_text); let source_change = def.rename(&ctx.sema, &d.suggested_text, true);
res.source_change = Some(source_change.ok().unwrap_or_default()); res.source_change = Some(source_change.ok().unwrap_or_default());
} }

View file

@ -680,8 +680,9 @@ impl Analysis {
&self, &self,
position: FilePosition, position: FilePosition,
new_name: &str, new_name: &str,
rename_external: bool,
) -> Cancellable<Result<SourceChange, RenameError>> { ) -> Cancellable<Result<SourceChange, RenameError>> {
self.with_db(|db| rename::rename(db, position, new_name)) self.with_db(|db| rename::rename(db, position, new_name, rename_external))
} }
pub fn prepare_rename( pub fn prepare_rename(

View file

@ -84,6 +84,7 @@ pub(crate) fn rename(
db: &RootDatabase, db: &RootDatabase,
position: FilePosition, position: FilePosition,
new_name: &str, new_name: &str,
rename_external: bool,
) -> RenameResult<SourceChange> { ) -> RenameResult<SourceChange> {
let sema = Semantics::new(db); let sema = Semantics::new(db);
let source_file = sema.parse(position.file_id); let source_file = sema.parse(position.file_id);
@ -103,7 +104,7 @@ pub(crate) fn rename(
return rename_to_self(&sema, local); return rename_to_self(&sema, local);
} }
} }
def.rename(&sema, new_name) def.rename(&sema, new_name, rename_external)
}) })
.collect(); .collect();
@ -122,9 +123,9 @@ pub(crate) fn will_rename_file(
let module = sema.to_module_def(file_id)?; let module = sema.to_module_def(file_id)?;
let def = Definition::Module(module); let def = Definition::Module(module);
let mut change = if is_raw_identifier(new_name_stem) { let mut change = if is_raw_identifier(new_name_stem) {
def.rename(&sema, &SmolStr::from_iter(["r#", new_name_stem])).ok()? def.rename(&sema, &SmolStr::from_iter(["r#", new_name_stem]), true).ok()?
} else { } else {
def.rename(&sema, new_name_stem).ok()? def.rename(&sema, new_name_stem, true).ok()?
}; };
change.file_system_edits.clear(); change.file_system_edits.clear();
Some(change) Some(change)
@ -375,8 +376,17 @@ mod tests {
use super::{RangeInfo, RenameError}; use super::{RangeInfo, RenameError};
#[track_caller]
fn check(new_name: &str, ra_fixture_before: &str, ra_fixture_after: &str) { fn check(new_name: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
check_with_rename_config(new_name, ra_fixture_before, ra_fixture_after, true);
}
#[track_caller]
fn check_with_rename_config(
new_name: &str,
ra_fixture_before: &str,
ra_fixture_after: &str,
rename_external: bool,
) {
let ra_fixture_after = &trim_indent(ra_fixture_after); let ra_fixture_after = &trim_indent(ra_fixture_after);
let (analysis, position) = fixture::position(ra_fixture_before); let (analysis, position) = fixture::position(ra_fixture_before);
if !ra_fixture_after.starts_with("error: ") { if !ra_fixture_after.starts_with("error: ") {
@ -385,7 +395,7 @@ mod tests {
} }
} }
let rename_result = analysis let rename_result = analysis
.rename(position, new_name) .rename(position, new_name, rename_external)
.unwrap_or_else(|err| panic!("Rename to '{new_name}' was cancelled: {err}")); .unwrap_or_else(|err| panic!("Rename to '{new_name}' was cancelled: {err}"));
match rename_result { match rename_result {
Ok(source_change) => { Ok(source_change) => {
@ -417,8 +427,10 @@ mod tests {
fn check_expect(new_name: &str, ra_fixture: &str, expect: Expect) { fn check_expect(new_name: &str, ra_fixture: &str, expect: Expect) {
let (analysis, position) = fixture::position(ra_fixture); let (analysis, position) = fixture::position(ra_fixture);
let source_change = let source_change = analysis
analysis.rename(position, new_name).unwrap().expect("Expect returned a RenameError"); .rename(position, new_name, true)
.unwrap()
.expect("Expect returned a RenameError");
expect.assert_eq(&filter_expect(source_change)) expect.assert_eq(&filter_expect(source_change))
} }
@ -2617,6 +2629,18 @@ use qux as frob;
#[test] #[test]
fn disallow_renaming_for_non_local_definition() { fn disallow_renaming_for_non_local_definition() {
check_with_rename_config(
"Baz",
r#"
//- /lib.rs crate:lib new_source_root:library
pub struct S;
//- /main.rs crate:main deps:lib new_source_root:local
use lib::S$0;
"#,
"error: Cannot rename a non-local definition. Set `renameExternalItems` to `true` to allow renaming for this item.",
false,
);
check( check(
"Baz", "Baz",
r#" r#"
@ -2625,13 +2649,13 @@ pub struct S;
//- /main.rs crate:main deps:lib new_source_root:local //- /main.rs crate:main deps:lib new_source_root:local
use lib::S$0; use lib::S$0;
"#, "#,
"error: Cannot rename a non-local definition.", "use lib::Baz;",
); );
} }
#[test] #[test]
fn disallow_renaming_for_builtin_macros() { fn disallow_renaming_for_builtin_macros() {
check( check_with_rename_config(
"Baz", "Baz",
r#" r#"
//- minicore: derive, hash //- minicore: derive, hash
@ -2640,8 +2664,9 @@ use core::hash::Hash;
#[derive(H$0ash)] #[derive(H$0ash)]
struct A; struct A;
"#, "#,
"error: Cannot rename a non-local definition.", "error: Cannot rename a non-local definition. Set `renameExternalItems` to `true` to allow renaming for this item.",
) false,
);
} }
#[test] #[test]

View file

@ -494,6 +494,9 @@ config_data! {
/// Exclude imports from find-all-references. /// Exclude imports from find-all-references.
references_excludeImports: bool = "false", references_excludeImports: bool = "false",
/// Allow renaming of items not belonging to any workspace crates.
renameExternalItems_enable : bool = "false",
/// Command to be executed instead of 'cargo' for runnables. /// Command to be executed instead of 'cargo' for runnables.
runnables_command: Option<String> = "null", runnables_command: Option<String> = "null",
/// Additional arguments to be passed to cargo for runnables such as /// Additional arguments to be passed to cargo for runnables such as
@ -1739,6 +1742,10 @@ impl Config {
self.data.typing_autoClosingAngleBrackets_enable self.data.typing_autoClosingAngleBrackets_enable
} }
pub fn rename(&self) -> bool {
self.data.renameExternalItems_enable
}
// FIXME: VSCode seems to work wrong sometimes, see https://github.com/microsoft/vscode/issues/193124 // FIXME: VSCode seems to work wrong sometimes, see https://github.com/microsoft/vscode/issues/193124
// hence, distinguish it for now. // hence, distinguish it for now.
pub fn is_visual_studio_code(&self) -> bool { pub fn is_visual_studio_code(&self) -> bool {

View file

@ -1017,8 +1017,10 @@ pub(crate) fn handle_rename(
let _p = profile::span("handle_rename"); let _p = profile::span("handle_rename");
let position = from_proto::file_position(&snap, params.text_document_position)?; let position = from_proto::file_position(&snap, params.text_document_position)?;
let mut change = let mut change = snap
snap.analysis.rename(position, &params.new_name)?.map_err(to_proto::rename_error)?; .analysis
.rename(position, &params.new_name, snap.config.rename())?
.map_err(to_proto::rename_error)?;
// this is kind of a hack to prevent double edits from happening when moving files // this is kind of a hack to prevent double edits from happening when moving files
// When a module gets renamed by renaming the mod declaration this causes the file to move // When a module gets renamed by renaming the mod declaration this causes the file to move

View file

@ -777,6 +777,11 @@ Internal config, path to proc-macro server executable.
-- --
Exclude imports from find-all-references. Exclude imports from find-all-references.
-- --
[[rust-analyzer.renameExternalItems.enable]]rust-analyzer.renameExternalItems.enable (default: `false`)::
+
--
Allow renaming of items not belonging to any workspace crates.
--
[[rust-analyzer.runnables.command]]rust-analyzer.runnables.command (default: `null`):: [[rust-analyzer.runnables.command]]rust-analyzer.runnables.command (default: `null`)::
+ +
-- --

View file

@ -1503,6 +1503,11 @@
"default": false, "default": false,
"type": "boolean" "type": "boolean"
}, },
"rust-analyzer.renameExternalItems.enable": {
"markdownDescription": "Allow renaming of items not belonging to any workspace crates.",
"default": false,
"type": "boolean"
},
"rust-analyzer.runnables.command": { "rust-analyzer.runnables.command": {
"markdownDescription": "Command to be executed instead of 'cargo' for runnables.", "markdownDescription": "Command to be executed instead of 'cargo' for runnables.",
"default": null, "default": null,