zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1756 from zed-industries/autoclose-wrong-closing-bracket

Browse Source 
Avoid skipping over a different closing bracket in autoclose
This commit is contained in:
Max Brunsfeld 2022-10-14 09:34:33 -07:00 committed by GitHub
commit 330968434f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/editor/src/editor.rs
View File

@ -1938,9 +1938,10 @@ impl Editor {
}
} else if let Some(region) = autoclose_region {
// If the selection is followed by an auto-inserted closing bracket,
// then don't insert anything else; just move the selection past the
// closing bracket.
let should_skip = selection.end == region.range.end.to_point(&snapshot);
// then don't insert that closing bracket again; just move the selection
// past the closing bracket.
let should_skip = selection.end == region.range.end.to_point(&snapshot)
&& text.as_ref() == region.pair.end.as_str();
if should_skip {
let anchor = snapshot.anchor_after(selection.end);
new_selections.push((

25
crates/editor/src/editor_tests.rs
View File

@ -2907,6 +2907,12 @@ async fn test_autoclose_pairs(cx: &mut gpui::TestAppContext) {
close: true,
newline: true,
},
BracketPair {
start: "(".to_string(),
end: ")".to_string(),
close: true,
newline: true,
},
BracketPair {
start: "/*".to_string(),
end: " */".to_string(),
@ -2957,6 +2963,19 @@ async fn test_autoclose_pairs(cx: &mut gpui::TestAppContext) {
.unindent(),
);
// insert a different closing bracket
cx.update_editor(|view, cx| {
view.handle_input(")", cx);
});
cx.assert_editor_state(
&"
🏀{{{)ˇ}}}
ε{{{)ˇ}}}
❤️{{{)ˇ}}}
"
.unindent(),
);
// skip over the auto-closed brackets when typing a closing bracket
cx.update_editor(|view, cx| {
view.move_right(&MoveRight, cx);
@ -2966,9 +2985,9 @@ async fn test_autoclose_pairs(cx: &mut gpui::TestAppContext) {
});
cx.assert_editor_state(
&"
🏀{{{}}}}ˇ
ε{{{}}}}ˇ
❤️{{{}}}}ˇ
🏀{{{)}}}}ˇ
ε{{{)}}}}ˇ
❤️{{{)}}}}ˇ
"
.unindent(),
);