on master help sign in
auto_pairs: move if cursor, extend if selection.
commit7e9ea30a0b4eee08322d689450efebe74dec8097 authorBlaž Hrastnik <blaz@mxxn.io> dateThu 22 Apr 2021, 23:26 (6 years ago) parent91767c3
1 file changed+12−2
helix-core/src/auto_pairs.rs+12−2
helix-core/src/auto_pairs.rs+12−2
@@ -69,7 +69,12 @@ fn handle_open(
6969 let pos = range.head;
7070 let next = next_char(doc, pos);
7171
72− ranges.push(Range::new(range.anchor, pos + open.len_utf8())); // pos + open
72+ let head = pos + open.len_utf8();
73+ // if selection, retain anchor, if cursor, move over
74+ ranges.push(Range::new(
75+ if range.is_empty() { head } else { range.anchor },
76+ head,
77+ ));
7378
7479 match next {
7580 Some(ch) if !close_before.contains(ch) => {
@@ -98,7 +103,12 @@ fn handle_close(doc: &Rope, selection: &Selection, _open: char, close: char) ->
98103 let pos = range.head;
99104 let next = next_char(doc, pos);
100105
101− ranges.push(Range::new(range.anchor, pos + close.len_utf8())); // pos + close
106+ let head = pos + close.len_utf8();
107+ // if selection, retain anchor, if cursor, move over
108+ ranges.push(Range::new(
109+ if range.is_empty() { head } else { range.anchor },
110+ head,
111+ ));
102112
103113 if next == Some(close) {
104114 // return transaction that moves past close