Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

language: Fix auto-indent overwriting manual indentation when replacing a line's contents (#62644)

Xin Zhao378d6254d5b4
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 6739552bf21..af3e1dd88cf 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -13363,6 +13363,56 @@ async fn test_autoindent_syntax_aware_applies_syntax_indent(cx: &mut TestAppCont
});
}
+#[gpui::test]
+async fn test_ime_composition_keeps_manual_indent(cx: &mut TestAppContext) {
+ init_test(cx, |settings| {
+ settings.defaults.auto_indent = Some(settings::AutoIndentMode::SyntaxAware)
+ });
+
+ let mut cx = EditorTestContext::new(cx).await;
+ let language = Arc::new(
+ Language::new(
+ LanguageConfig {
+ brackets: BracketPairConfig {
+ pairs: vec![BracketPair {
+ start: "{".to_string(),
+ end: "}".to_string(),
+ close: false,
+ surround: false,
+ newline: false,
+ }],
+ ..Default::default()
+ },
+ ..Default::default()
+ },
+ Some(tree_sitter_rust::LANGUAGE.into()),
+ )
+ .with_indents_query(r#"(_ "{" "}" @end) @indent"#)
+ .unwrap(),
+ );
+ cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+ cx.set_state("fn foo() {ˇ\n}");
+ cx.condition(|editor, cx| !editor.buffer.read(cx).is_parsing(cx))
+ .await;
+
+ cx.update_editor(|editor, window, cx| {
+ editor.newline(&Newline, window, cx);
+ // A manual indent here
+ editor.tab(&Tab, window, cx);
+ });
+ assert_eq!(cx.buffer_text(), "fn foo() {\n \n}");
+
+ cx.update_editor(|editor, window, cx| {
+ editor.replace_and_mark_text_in_range(None, "n", None, window, cx);
+ editor.replace_and_mark_text_in_range(None, "nn", None, window, cx);
+ });
+
+ cx.run_until_parked();
+
+ assert_eq!(cx.buffer_text(), "fn foo() {\n nn\n}");
+}
+
#[gpui::test]
async fn test_autoindent_disabled_with_nested_language(cx: &mut TestAppContext) {
init_test(cx, |settings| {
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index e538fa0a036..2f30033dae9 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -2893,6 +2893,7 @@ impl Buffer {
.map(|((ix, (range, _)), new_text)| {
let new_text_length = new_text.len();
let old_start = range.start.to_point(&before_edit);
+ let old_end = range.end.to_point(&before_edit);
let new_start = (delta + range.start as isize) as usize;
let range_len = range.end - range.start;
delta += new_text_length as isize - range_len as isize;
@@ -2911,8 +2912,7 @@ impl Buffer {
}
if !new_text.contains('\n')
- && (old_start.column + (range_len as u32) < old_line_end
- || old_line_end == old_line_start)
+ && (old_end.row == old_start.row || old_line_end == old_line_start)
{
first_line_is_new = false;
}
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index d69e19a83a0..43162527088 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -2676,6 +2676,42 @@ fn test_autoindent_block_mode_multiple_adjacent_ranges(cx: &mut App) {
});
}
+#[gpui::test]
+fn test_replacing_line_content_keeps_manual_indent(cx: &mut App) {
+ init_settings(cx, |_| {});
+
+ cx.new(|cx| {
+ let (text, ranges_to_replace) = marked_text_ranges(
+ // 8 spaces here to represent the additional manual indentation
+ indoc! {r#"
+ fn main() {
+ «println!("hello");»
+ }
+ "#},
+ false,
+ );
+
+ let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
+
+ buffer.edit(
+ [(ranges_to_replace[0].clone(), "let x = 1;")],
+ Some(AutoindentMode::EachLine),
+ cx,
+ );
+
+ assert_eq!(
+ buffer.text(),
+ indoc! {r#"
+ fn main() {
+ let x = 1;
+ }
+ "#}
+ );
+
+ buffer
+ });
+}
+
#[gpui::test]
fn test_autoindent_language_without_indents_query(cx: &mut App) {
init_settings(cx, |_| {});