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

70
crates/editor/src/editor_tests.rs
View file

@ -2,8 +2,10 @@ use super::*;
use crate::{
scroll::scroll_amount::ScrollAmount,
test::{
assert_text_with_selections, build_editor, editor_lsp_test_context::EditorLspTestContext,
editor_test_context::EditorTestContext, select_ranges,
assert_text_with_selections, build_editor,
editor_lsp_test_context::{git_commit_lang, EditorLspTestContext},
editor_test_context::EditorTestContext,
select_ranges,
},
JoinLines,
};
@ -4746,6 +4748,7 @@ async fn test_hard_wrap(cx: &mut TestAppContext) {
init_test(cx, |_| {});
let mut cx = EditorTestContext::new(cx).await;
cx.update_buffer(|buffer, cx| buffer.set_language(Some(git_commit_lang()), cx));
cx.update_editor(|editor, _, cx| {
editor.set_hard_wrap(Some(14), cx);
});
@ -4764,6 +4767,69 @@ async fn test_hard_wrap(cx: &mut TestAppContext) {
fourˇ
"
));
cx.update_editor(|editor, window, cx| {
editor.newline(&Default::default(), window, cx);
});
cx.run_until_parked();
cx.assert_editor_state(indoc!(
"
one two three
four
ˇ
"
));
cx.simulate_input("five");
cx.run_until_parked();
cx.assert_editor_state(indoc!(
"
one two three
four
fiveˇ
"
));
cx.update_editor(|editor, window, cx| {
editor.newline(&Default::default(), window, cx);
});
cx.run_until_parked();
cx.simulate_input("# ");
cx.run_until_parked();
cx.assert_editor_state(indoc!(
"
one two three
four
five
# ˇ
"
));
cx.update_editor(|editor, window, cx| {
editor.newline(&Default::default(), window, cx);
});
cx.run_until_parked();
cx.assert_editor_state(indoc!(
"
one two three
four
five
#\x20
#ˇ
"
));
cx.simulate_input(" 6");
cx.run_until_parked();
cx.assert_editor_state(indoc!(
"
one two three
four
five
#
# 6ˇ
"
));
}
#[gpui::test]