TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Auto pair-removal (#2940)

Browse source 
* auto pair-removal

Fixes https://github.com/helix-editor/helix/issues/1673

* autopairs removal: use doc autopairs

* autopairs-removal: limit to one-char selections

* use single_grapheme() to check if range is one char

* fix errouneous deletes of " and other symmetric autopairs when at buffer start

Co-authored-by: Houkime <>
This commit is contained in:
Houkime 2022-07-22 01:23:52 +00:00 • committed by GitHub
parent 19b7864062
commit 52bb1103f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
helix-term/src/commands.rs
View file

@ -3056,14 +3056,18 @@ pub mod insert {
pub fn delete_char_backward(cx: &mut Context) { pub fn delete_char_backward(cx: &mut Context) {
let count = cx.count(); let count = cx.count();
let (view, doc) = current!(cx.editor); let (view, doc) = current_ref!(cx.editor);
let text = doc.text().slice(..); let text = doc.text().slice(..);
let indent_unit = doc.indent_unit(); let indent_unit = doc.indent_unit();
let tab_size = doc.tab_width(); let tab_size = doc.tab_width();
let auto_pairs = doc.auto_pairs(cx.editor);
let transaction = let transaction =
Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| { Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
let pos = range.cursor(text); let pos = range.cursor(text);
if pos == 0 {
return (pos, pos, None);
}
let line_start_pos = text.line_to_char(range.cursor_line(text)); let line_start_pos = text.line_to_char(range.cursor_line(text));
// consider to delete by indent level if all characters before `pos` are indent units. // consider to delete by indent level if all characters before `pos` are indent units.
let fragment = Cow::from(text.slice(line_start_pos..pos)); let fragment = Cow::from(text.slice(line_start_pos..pos));
@ -3111,14 +3115,36 @@ pub mod insert {
(start, pos, None) // delete! (start, pos, None) // delete!
} }
} else { } else {
// delete char match (
( text.get_char(pos.saturating_sub(1)),
graphemes::nth_prev_grapheme_boundary(text, pos, count), text.get_char(pos),
pos, auto_pairs,
None, ) {
) (Some(_x), Some(_y), Some(ap))
if range.is_single_grapheme(text)
&& ap.get(_x).is_some()
&& ap.get(_x).unwrap().close == _y =>
// delete both autopaired characters
{
(
graphemes::nth_prev_grapheme_boundary(text, pos, count),
graphemes::nth_next_grapheme_boundary(text, pos, count),
None,
)
}
_ =>
// delete 1 char
{
(
graphemes::nth_prev_grapheme_boundary(text, pos, count),
pos,
None,
)
}
}
} }
}); });
let (view, doc) = current!(cx.editor);
doc.apply(&transaction, view.id); doc.apply(&transaction, view.id);
lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic); lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);