Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Add a next_mode to vim::Paste instead of hard-coding Normal mode (#27897) (#28162)

Browse source 
This PR reverts #27897, as it is causing a number of Helix-related tests
to fail:

```
     Summary [  84.324s] 1796 tests run: 1793 passed, 3 failed, 0 skipped
        FAIL [   0.434s] vim helix::test::test_delete
        FAIL [   0.562s] vim helix::test::test_delete_character_end_of_buffer
        FAIL [   0.537s] vim helix::test::test_delete_character_end_of_line
```

This reverts commit 9949512b64.

Release Notes:

- Community: Reverted https://github.com/zed-industries/zed/pull/27897.
This commit is contained in:
Marshall Bowers 2025-04-05 15:52:56 -04:00 • committed by GitHub
parent 9949512b64
commit 41827372fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/vim/src/normal/paste.rs
View file

@ -3,11 +3,10 @@ use gpui::{Context, Window, impl_actions};
use language::{Bias, SelectionGoal}; use language::{Bias, SelectionGoal};
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::Deserialize; use serde::Deserialize;
use settings::Settings;
use std::cmp; use std::cmp;
use crate::{ use crate::{
Vim, VimSettings, Vim,
motion::{Motion, MotionKind}, motion::{Motion, MotionKind},
object::Object, object::Object,
state::{Mode, Register}, state::{Mode, Register},
@ -204,8 +203,7 @@ impl Vim {
}) })
}); });
}); });
let next_mode = VimSettings::get_global(cx).default_mode; self.switch_mode(Mode::Normal, true, window, cx);
self.switch_mode(next_mode, true, window, cx);
} }
pub fn replace_with_register_object( pub fn replace_with_register_object(