zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where cursors became invisible if replaying was interrupted

Browse Source
This commit is contained in:
Conrad Irwin 2023-09-11 18:48:24 -06:00
parent 76d55244a1
commit c2c521015a
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/vim/src/editor_events.rs
View File

@ -34,7 +34,9 @@ fn focused(EditorFocused(editor): &EditorFocused, cx: &mut AppContext) {
fn blurred(EditorBlurred(editor): &EditorBlurred, cx: &mut AppContext) { fn blurred(EditorBlurred(editor): &EditorBlurred, cx: &mut AppContext) {
editor.window().update(cx, |cx| { editor.window().update(cx, |cx| {
Vim::update(cx, |vim, cx| { Vim::update(cx, |vim, cx| {
vim.clear_operator(cx);
vim.workspace_state.recording = false; vim.workspace_state.recording = false;
vim.workspace_state.recorded_actions.clear();
if let Some(previous_editor) = vim.active_editor.clone() { if let Some(previous_editor) = vim.active_editor.clone() {
if previous_editor == editor.clone() { if previous_editor == editor.clone() {
vim.active_editor = None; vim.active_editor = None;

34
crates/vim/src/normal/repeat.rs
View File

@ -43,9 +43,6 @@ pub(crate) fn init(cx: &mut AppContext) {
cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| { cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| {
Vim::update(cx, |vim, cx| { Vim::update(cx, |vim, cx| {
vim.workspace_state.replaying = false; vim.workspace_state.replaying = false;
vim.update_active_editor(cx, |editor, _| {
editor.show_local_selections = true;
});
vim.switch_mode(Mode::Normal, false, cx) vim.switch_mode(Mode::Normal, false, cx)
}); });
}); });
@ -56,6 +53,10 @@ pub(crate) fn init(cx: &mut AppContext) {
pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) { pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
let Some((mut actions, editor, selection)) = Vim::update(cx, |vim, cx| { let Some((mut actions, editor, selection)) = Vim::update(cx, |vim, cx| {
let actions = vim.workspace_state.recorded_actions.clone(); let actions = vim.workspace_state.recorded_actions.clone();
if actions.is_empty() {
return None;
}
let Some(editor) = vim.active_editor.clone() else { let Some(editor) = vim.active_editor.clone() else {
return None; return None;
}; };
@ -82,14 +83,6 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
} }
} }
if let Some(editor) = editor.upgrade(cx) {
editor.update(cx, |editor, _| {
editor.show_local_selections = false;
})
} else {
return None;
}
Some((actions, editor, selection)) Some((actions, editor, selection))
}) else { }) else {
return; return;
@ -176,6 +169,9 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
let window = cx.window(); let window = cx.window();
cx.app_context() cx.app_context()
.spawn(move |mut cx| async move { .spawn(move |mut cx| async move {
editor.update(&mut cx, |editor, _| {
editor.show_local_selections = false;
})?;
for action in actions { for action in actions {
match action { match action {
ReplayableAction::Action(action) => { ReplayableAction::Action(action) => {
@ -195,6 +191,9 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
}), }),
}? }?
} }
editor.update(&mut cx, |editor, _| {
editor.show_local_selections = true;
})?;
window window
.dispatch_action(editor.id(), &EndRepeat, &mut cx) .dispatch_action(editor.id(), &EndRepeat, &mut cx)
.ok_or_else(|| anyhow::anyhow!("window was closed")) .ok_or_else(|| anyhow::anyhow!("window was closed"))
@ -513,4 +512,17 @@ mod test {
}) })
.await; .await;
} }
#[gpui::test]
async fn test_record_interrupted(
deterministic: Arc<Deterministic>,
cx: &mut gpui::TestAppContext,
) {
let mut cx = VimTestContext::new(cx, true).await;
cx.set_state("ˇhello\n", Mode::Normal);
cx.simulate_keystrokes(["4", "i", "j", "cmd-shift-p", "escape", "escape"]);
deterministic.run_until_parked();
cx.assert_state("ˇjhello\n", Mode::Normal);
}
} }