diff options
author | Lukas Tobias Wirth <[email protected]> | 2021-05-19 13:19:44 +0100 |
---|---|---|
committer | Lukas Tobias Wirth <[email protected]> | 2021-05-19 13:19:44 +0100 |
commit | 2c7a8c485710beb5700bb7a474cd152f0b075a0f (patch) | |
tree | af0cebc0576cecdf659361f53296d6dac2845fa2 /crates | |
parent | e3d0d89d7e3e253234271008df9324ec1faf1746 (diff) |
Fix prepare_rename failing for modules
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ide/src/references/rename.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs index 2bf953305..01fe3a1a1 100644 --- a/crates/ide/src/references/rename.rs +++ b/crates/ide/src/references/rename.rs | |||
@@ -55,12 +55,14 @@ pub(crate) fn prepare_rename( | |||
55 | match def { | 55 | match def { |
56 | Definition::SelfType(_) => bail!("Cannot rename `Self`"), | 56 | Definition::SelfType(_) => bail!("Cannot rename `Self`"), |
57 | Definition::ModuleDef(ModuleDef::BuiltinType(_)) => bail!("Cannot rename builtin type"), | 57 | Definition::ModuleDef(ModuleDef::BuiltinType(_)) => bail!("Cannot rename builtin type"), |
58 | _ => {} | 58 | Definition::ModuleDef(ModuleDef::Module(_)) => (), |
59 | _ => { | ||
60 | let nav = def | ||
61 | .try_to_nav(sema.db) | ||
62 | .ok_or_else(|| format_err!("No references found at position"))?; | ||
63 | nav.focus_range.ok_or_else(|| format_err!("No identifier available to rename"))?; | ||
64 | } | ||
59 | }; | 65 | }; |
60 | let nav = | ||
61 | def.try_to_nav(sema.db).ok_or_else(|| format_err!("No references found at position"))?; | ||
62 | nav.focus_range.ok_or_else(|| format_err!("No identifier available to rename"))?; | ||
63 | |||
64 | let name_like = sema | 66 | let name_like = sema |
65 | .find_node_at_offset_with_descend(&syntax, position.offset) | 67 | .find_node_at_offset_with_descend(&syntax, position.offset) |
66 | .ok_or_else(|| format_err!("No references found at position"))?; | 68 | .ok_or_else(|| format_err!("No references found at position"))?; |