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

work around broken snippet files

Browse source
This commit is contained in:
Johannes Rieken 2016-11-11 16:43:28 +01:00
parent ae23d37999
commit 613dd2eb19
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/editor/contrib/snippet/common/snippet.ts
View file

@ -474,7 +474,7 @@ function _fillCodeSnippetFromMarker(snippet: CodeSnippet, marker: Marker[]) {
snippet.lines.push(...lines);
} else if (marker instanceof Placeholder) {
// TODO - not every variable is a placeholder
let placeHolder = placeHolders[marker.name];
if (!placeHolder) {
placeHolders[marker.name] = placeHolder = {
@ -495,7 +495,14 @@ function _fillCodeSnippetFromMarker(snippet: CodeSnippet, marker: Marker[]) {
endColumn: column + Marker.toString(marker.value).length // TODO multiline placeholders!
});
stack.unshift(...marker.value);
if (marker.value.length === 0 && marker.isVariable) {
// HACK this is here because we falsy advertise
// ${foo} as placeholder in our own snippets
stack.unshift(new Text(marker.name));
} else {
stack.unshift(...marker.value);
}
}
}

2
src/vs/editor/contrib/snippet/test/common/snippet.test.ts
View file

@ -73,7 +73,7 @@ suite('Editor Contrib - Snippets', () => {
assertInternalAndTextmate(
'{{first}}-{{2:}}-{{second}}-{{1:}}',
'${first:first}-${2}-${second:second}-${1}',
'${first}-${2}-${second}-${1}',
snippet => {
assert.deepEqual(snippet.lines, ['first--second-']);
assert.equal(snippet.placeHolders.length, 4);