Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-27 02:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix an issue with variable names and snippet rewriting

Browse Source
This commit is contained in:
Johannes Rieken
2017-07-25 15:03:50 +02:00
parent bca2236bd5
commit 269c8e64ad
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
+2
View File
@@ -197,6 +197,8 @@ suite('SnippetParser', () => {
assertTextAndMarker('$123', '', Placeholder);
assertTextAndMarker('$farboo', '', Variable);
assertTextAndMarker('$far12boo', '', Variable);
assertTextAndMarker('000_${far}_000', '000__000', Text, Variable, Text);
assertTextAndMarker('FFF_${TM_SELECTED_TEXT}_FFF$0', 'FFF__FFF', Text, Variable, Text, Placeholder);
});
test('Parser, variables/placeholder with defaults', () => {
src/vs/workbench/parts/emmet/electron-browser/editorAccessor.ts
+1 -1
View File
@@ -155,7 +155,7 @@ export class EditorAccessor implements emmet.Editor {
if (marker.children.length > 0) {
return `\${${marker.name}:${marker.children.map(toSnippetString).join('')}}`;
} else {
return `\$${marker.name}`;
return `\${${marker.name}}`;
}
} else {
throw new Error('unexpected marker: ' + marker);
src/vs/workbench/parts/snippets/electron-browser/TMSnippets.ts
+1 -1
View File
@@ -193,7 +193,7 @@ function _rewriteBogousVariables(snippet: ISnippet): boolean {
} else if (marker.children.length > 0) {
return `\${${marker.name}:${marker.children.map(fixBogousVariables).join('')}}`;
} else {
return `\$${marker.name}`;
return `\${${marker.name}}`;
}
} else {
throw new Error('unexpected marker: ' + marker);