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.

editor: Fix splitting brackets inside line comments (#59260)

Xin Zhaocccc7b2d4408
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 8c547eff6ff..22b0e1a6354 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -4664,6 +4664,43 @@ async fn test_newline_comments_with_multiple_delimiters(cx: &mut TestAppContext)
}
}
+#[gpui::test]
+async fn test_newline_comments_with_brackets(cx: &mut TestAppContext) {
+ init_test(cx, |settings| {
+ settings.defaults.tab_size = NonZeroU32::new(4)
+ });
+ let language = Arc::new(Language::new(
+ LanguageConfig {
+ line_comments: vec!["// ".into()],
+ brackets: BracketPairConfig {
+ pairs: vec![BracketPair {
+ start: "(".to_string(),
+ end: ")".to_string(),
+ close: false,
+ surround: false,
+ newline: true,
+ }],
+ ..BracketPairConfig::default()
+ },
+ ..LanguageConfig::default()
+ },
+ None,
+ ));
+
+ {
+ let mut cx = EditorTestContext::new(cx).await;
+ cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+ cx.set_state(indoc! {"
+ // (ˇ)
+ "});
+ cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
+ cx.assert_editor_state(indoc! {"
+ // (
+ // ˇ)
+ "})
+ }
+}
+
#[gpui::test]
async fn test_newline_comments_repl_separators(cx: &mut TestAppContext) {
init_test(cx, |settings| {
diff --git a/crates/editor/src/input.rs b/crates/editor/src/input.rs
index bf213ee20a5..a9ef778a056 100644
--- a/crates/editor/src/input.rs
+++ b/crates/editor/src/input.rs
@@ -578,8 +578,9 @@ impl Editor {
},
prevent_auto_indent: false,
};
+ let mut delimiter = None;
- let comment_delimiter = maybe!({
+ if let Some(comment_delimiter) = maybe!({
if !selection_is_empty {
return None;
}
@@ -593,9 +594,16 @@ impl Editor {
&buffer,
language,
);
- });
-
- let doc_delimiter = maybe!({
+ }) {
+ delimiter = Some(comment_delimiter);
+ if let NewlineConfig::Newline {
+ extra_line_additional_indent,
+ ..
+ } = &mut newline_config
+ {
+ *extra_line_additional_indent = None;
+ }
+ } else if let Some(doc_delimiter) = maybe!({
if !selection_is_empty {
return None;
}
@@ -610,9 +618,9 @@ impl Editor {
language,
&mut newline_config,
);
- });
-
- let list_delimiter = maybe!({
+ }) {
+ delimiter = Some(doc_delimiter);
+ } else if let Some(list_delimiter) = maybe!({
if !selection_is_empty {
return None;
}
@@ -627,12 +635,11 @@ impl Editor {
language,
&mut newline_config,
);
- });
+ }) {
+ delimiter = Some(list_delimiter);
+ }
- (
- comment_delimiter.or(doc_delimiter).or(list_delimiter),
- newline_config,
- )
+ (delimiter, newline_config)
} else {
(
None,