ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-11-10 14:46:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

auto_pairs: move if cursor, extend if selection.

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-04-22 23:26:57 +09:00
parent 91767c3848
commit 7e9ea30a0b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
helix-core/src/auto_pairs.rs
View File

@ -69,7 +69,12 @@ fn handle_open(
let pos = range.head;
let next = next_char(doc, pos);
ranges.push(Range::new(range.anchor, pos + open.len_utf8())); // pos + open
let head = pos + open.len_utf8();
// if selection, retain anchor, if cursor, move over
ranges.push(Range::new(
if range.is_empty() { head } else { range.anchor },
head,
));
match next {
Some(ch) if !close_before.contains(ch) => {
@ -98,7 +103,12 @@ fn handle_close(doc: &Rope, selection: &Selection, _open: char, close: char) ->
let pos = range.head;
let next = next_char(doc, pos);
ranges.push(Range::new(range.anchor, pos + close.len_utf8())); // pos + close
let head = pos + close.len_utf8();
// if selection, retain anchor, if cursor, move over
ranges.push(Range::new(
if range.is_empty() { head } else { range.anchor },
head,
));
if next == Some(close) {
// return transaction that moves past close