maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix #23728

Browse source
This commit is contained in:
Johannes Rieken 2017-06-07 17:36:10 +02:00
parent fcf8b2942d
commit dfc9961ae1
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/editor/contrib/snippet/browser/snippetSession.ts
View file

@ -296,7 +296,7 @@ export class SnippetSession {
// store snippets with the index of their originating selection.
// that ensures the primiary cursor stays primary despite not being
// the one with lowest start position
edits[idx] = EditOperation.replaceMove(snippetSelection, snippet.text);
edits[idx] = EditOperation.replace(snippetSelection, snippet.text);
snippets[idx] = new OneSnippet(editor, snippet, offset);
}

19
src/vs/editor/contrib/snippet/test/browser/snippetController2.test.ts
View file

@ -224,4 +224,23 @@ suite('SnippetController2', function () {
ctrl.prev(); // inner `$0`
assertSelections(editor, new Selection(1, 31, 1, 31), new Selection(2, 35, 2, 35));
});
test('Snippet tabstop selecting content of previously entered variable only works when separated by space, #23728', function () {
const ctrl = new SnippetController2(editor, contextKeys);
model.setValue('');
editor.setSelection(new Selection(1, 1, 1, 1));
ctrl.insert('import ${2:${1:module}} from \'${1: module }\'$0');
assertContextKeys(contextKeys, true, false, true);
assertSelections(editor, new Selection(1, 8, 1, 14), new Selection(1, 21, 1, 29));
ctrl.insert('foo');
assertSelections(editor, new Selection(1, 11, 1, 11), new Selection(1, 21, 1, 21));
ctrl.next(); // ${2:...}
assertSelections(editor, new Selection(1, 8, 1, 11));
});
});