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

Improvements to interactive hard wrap behavior (#26953)

Browse source 
Release Notes:

- Fixed involuntary joining of lines when typing in the commit message
editor
- Fixed being unable to type whitespace after a comment character at the
start of a line in the commit message editor
This commit is contained in:
Cole Miller 2025-03-18 13:05:08 -04:00 • committed by GitHub
parent 41a60ffecf
commit e7bba1c252
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 254 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/vim/src/rewrap.rs
View file

@ -1,6 +1,6 @@
use crate::{motion::Motion, object::Object, state::Mode, Vim};
use collections::HashMap;
use editor::{display_map::ToDisplayPoint, scroll::Autoscroll, Bias, Editor};
use editor::{display_map::ToDisplayPoint, scroll::Autoscroll, Bias, Editor, RewrapOptions};
use gpui::{actions, Context, Window};
use language::SelectionGoal;
@ -14,7 +14,13 @@ pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
vim.update_editor(window, cx, |vim, editor, window, cx| {
editor.transact(window, cx, |editor, window, cx| {
let mut positions = vim.save_selection_starts(editor, cx);
editor.rewrap_impl(true, cx);
editor.rewrap_impl(
RewrapOptions {
override_language_settings: true,
..Default::default()
},
cx,
);
editor.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
s.move_with(|map, selection| {
if let Some(anchor) = positions.remove(&selection.id) {
@ -52,7 +58,13 @@ impl Vim {
motion.expand_selection(map, selection, times, false, &text_layout_details);
});
});
editor.rewrap_impl(true, cx);
editor.rewrap_impl(
RewrapOptions {
override_language_settings: true,
..Default::default()
},
cx,
);
editor.change_selections(None, window, cx, |s| {
s.move_with(|map, selection| {
let anchor = selection_starts.remove(&selection.id).unwrap();
@ -83,7 +95,13 @@ impl Vim {
object.expand_selection(map, selection, around);
});
});
editor.rewrap_impl(true, cx);
editor.rewrap_impl(
RewrapOptions {
override_language_settings: true,
..Default::default()
},
cx,
);
editor.change_selections(None, window, cx, |s| {
s.move_with(|map, selection| {
let anchor = original_positions.remove(&selection.id).unwrap();