@@ -66,7 +66,7 @@ pub fn into_transaction<'a>(
6666 offset_encoding: OffsetEncoding,
6767 include_placeholer: bool,
6868) -> helix_core::Transaction {
69− use helix_core::{smallvec, Range, Selection, Transaction};
69+ use helix_core::{smallvec, Range, Transaction};
7070 use SnippetElement::*;
7171
7272 let text = doc.slice(..);
@@ -87,9 +87,9 @@ pub fn into_transaction<'a>(
8787 blank = ""
8888 );
8989
90+ let mut offset = 0;
9091 let mut insert = String::new();
91− let mut offset = (primary_cursor as i128 + start_offset) as usize;
92− let mut tabstops: Vec<(usize, Range)> = Vec::new();
92+ let mut tabstops: Vec<(usize, usize, usize)> = Vec::new();
9393
9494 for element in snippet.elements {
9595 match element {
@@ -114,7 +114,7 @@ pub fn into_transaction<'a>(
114114 insert.push_str(text);
115115 }
116116 Tabstop { tabstop } => {
117− tabstops.push((tabstop, Range::point(offset)));
117+ tabstops.push((tabstop, offset, offset));
118118 }
119119 Placeholder { tabstop, value } => match value.as_ref() {
120120 // https://doc.rust-lang.org/beta/unstable-book/language-features/box-patterns.html
@@ -122,11 +122,11 @@ pub fn into_transaction<'a>(
122122 Text(text) => {
123123 if include_placeholer {
124124 let len_chars = text.chars().count();
125− tabstops.push((tabstop, Range::new(offset, offset + len_chars + 1)));
125+ tabstops.push((tabstop, offset, offset + len_chars + 1));
126126 offset += len_chars;
127127 insert.push_str(text);
128128 } else {
129− tabstops.push((tabstop, Range::point(offset)));
129+ tabstops.push((tabstop, offset, offset));
130130 }
131131 }
132132 other => {
@@ -157,24 +157,38 @@ pub fn into_transaction<'a>(
157157 });
158158
159159 // sort in ascending order (except for 0, which should always be the last one (per lsp doc))
160− tabstops.sort_unstable_by_key(|(n, _range)| if *n == 0 { usize::MAX } else { *n });
160+ tabstops.sort_unstable_by_key(|(n, _o1, _o2)| if *n == 0 { usize::MAX } else { *n });
161161
162162 // merge tabstops with the same index (we take advantage of the fact that we just sorted them
163163 // above to simply look backwards)
164− let mut ntabstops = Vec::<SmallVec<[Range; 1]>>::new();
165− let mut prev = None;
166− for (tabstop, range) in tabstops {
167− if prev == Some(tabstop) {
168− let len_1 = ntabstops.len() - 1;
169− ntabstops[len_1].push(range);
170− } else {
171− prev = Some(tabstop);
172− ntabstops.push(smallvec![range]);
164+ let mut ntabstops = Vec::<SmallVec<[(usize, usize); 1]>>::new();
165+ {
166+ let mut prev = None;
167+ for (tabstop, o1, o2) in tabstops {
168+ if prev == Some(tabstop) {
169+ let len_1 = ntabstops.len() - 1;
170+ ntabstops[len_1].push((o1, o2));
171+ } else {
172+ prev = Some(tabstop);
173+ ntabstops.push(smallvec![(o1, o2)]);
174+ }
173175 }
174176 }
175177
176178 if let Some(first) = ntabstops.first() {
177− transaction.with_selection(Selection::new(first.clone(), 0))
179+ let cursor_offset = insert.chars().count() as i128 - (end_offset - start_offset);
180+ let mut extra_offset = start_offset;
181+ transaction.with_selection(selection.clone().transform_iter(|range| {
182+ let cursor = range.cursor(text);
183+ let iter = first.iter().map(move |first| {
184+ Range::new(
185+ (cursor as i128 + first.0 as i128 + extra_offset) as usize,
186+ (cursor as i128 + first.1 as i128 + extra_offset) as usize,
187+ )
188+ });
189+ extra_offset += cursor_offset;
190+ iter
191+ }))
178192 } else {
179193 transaction
180194 }