Skip to content

editor: Fix splitting brackets inside line comments #59260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristopherBiscardi merged 1 commit into from
Jun 15, 2026
Merged

editor: Fix splitting brackets inside line comments #59260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions crates/editor/src/editor_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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| {
Expand Down
31 changes: 19 additions & 12 deletions crates/editor/src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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,
Expand Down
Loading