zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Always clear rename state when selections change

Browse Source 
At some point during the implementation of rename, we added logic for
invalidating the rename state when the selection moved outside the original
rename range. After transitioning to displaying renames as a block decoration,
we don't need that anymore given that a new, temporary editor is used instead.

This commit removes that invalidation logic and always calls `Editor::take_rename`
when the editor selections change. Doing so also fixes a bug that was causing Zed
to hide the cursor when clicking on the editor to dismiss the rename.
This commit is contained in:
Antonio Scandurra 2022-04-15 10:26:39 +02:00
parent 9820c6ba64
commit 2695b13947
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/editor/src/editor.rs
View File

@ -4808,25 +4808,6 @@ impl Editor {
Some(rename)
}
fn invalidate_rename_range(
&mut self,
buffer: &MultiBufferSnapshot,
cx: &mut ViewContext<Self>,
) {
if let Some(rename) = self.pending_rename.as_ref() {
if self.selections.len() == 1 {
let head = self.selections[0].head().to_offset(buffer);
let range = rename.range.to_offset(buffer).to_inclusive();
if range.contains(&head) {
return;
}
}
let rename = self.pending_rename.take().unwrap();
self.remove_blocks([rename.block_id].into_iter().collect(), cx);
self.clear_background_highlights::<Rename>(cx);
}
}
#[cfg(any(test, feature = "test-support"))]
pub fn pending_rename(&self) -> Option<&RenameState> {
self.pending_rename.as_ref()
@ -5332,7 +5313,7 @@ impl Editor {
self.select_larger_syntax_node_stack.clear();
self.autoclose_stack.invalidate(&self.selections, &buffer);
self.snippet_stack.invalidate(&self.selections, &buffer);
self.invalidate_rename_range(&buffer, cx);
self.take_rename(false, cx);
let new_cursor_position = self.newest_anchor_selection().head();