@@ -47,6 +47,7 @@ use crate::{
search::{FindCommand, ReplaceCommand, Replacement},
},
object::Object,
+ rewrap::Rewrap,
state::{Mark, Mode},
visual::VisualDeleteLine,
};
@@ -1725,6 +1726,7 @@ fn generate_commands(_: &App) -> Vec<VimCommand> {
)
.range(wrap_count),
VimCommand::new(("j", "oin"), JoinLines).range(select_range),
+ VimCommand::new(("reflow", ""), Rewrap).range(select_range),
VimCommand::new(("fo", "ld"), editor::actions::FoldSelectedRanges).range(act_on_range),
VimCommand::new(("foldo", "pen"), editor::actions::UnfoldLines)
.bang(editor::actions::UnfoldRecursive)
@@ -3537,4 +3539,53 @@ mod test {
Mode::Normal,
);
}
+
+ #[gpui::test]
+ async fn test_reflow(cx: &mut TestAppContext) {
+ let mut cx = VimTestContext::new(cx, true).await;
+
+ cx.update_editor(|editor, _window, cx| {
+ editor.set_hard_wrap(Some(10), cx);
+ });
+
+ cx.set_state(
+ indoc! {"
+ ห0123456789 0123456789 0123456789 0123456789
+ "},
+ Mode::Normal,
+ );
+
+ cx.simulate_keystrokes(": reflow");
+ cx.simulate_keystrokes("enter");
+
+ cx.assert_state(
+ indoc! {"
+ 0123456789
+ 0123456789
+ 0123456789
+ ห0123456789
+ "},
+ Mode::Normal,
+ );
+
+ cx.set_state(
+ indoc! {"
+ ยซ0123456789 0123456789หยป
+ 0123456789 0123456789
+ "},
+ Mode::VisualLine,
+ );
+
+ cx.simulate_keystrokes(": reflow");
+ cx.simulate_keystrokes("enter");
+
+ cx.assert_state(
+ indoc! {"
+ ห0123456789
+ 0123456789
+ 0123456789 0123456789
+ "},
+ Mode::Normal,
+ );
+ }
}