snippets - handle escaped closed curly, better compacting

src/vs/editor/contrib/snippet/common/snippetParser.ts

@@ -186,24 +186,32 @@ export class SnippetParser {
 
 		// * fill in default for empty placeHolders
 		// * compact sibling Text markers
-		const placeholders: { [name: string]: Marker[] } = Object.create(null);
-		for (let i = 0; i < marker.length; i++) {
-			let thisMarker = marker[i];
-
-			if (thisMarker instanceof Placeholder) {
-				if (placeholders[thisMarker.name] === undefined) {
-					placeholders[thisMarker.name] = thisMarker.value;
-				} else if (thisMarker.value.length === 0) {
-					thisMarker.value = placeholders[thisMarker.name].slice(0);
-				}
+		function compact(marker: Marker[], placeholders: { [name: string]: Marker[] }) {
+
+			for (let i = 0; i < marker.length; i++) {
+				const thisMarker = marker[i];
+
+				if (thisMarker instanceof Placeholder) {
+					if (placeholders[thisMarker.name] === undefined) {
+						placeholders[thisMarker.name] = thisMarker.value;
+					} else if (thisMarker.value.length === 0) {
+						thisMarker.value = placeholders[thisMarker.name].slice(0);
+					}
 
-			} else if (i > 0 && thisMarker instanceof Text && marker[i - 1] instanceof Text) {
-				(<Text>marker[i - 1]).string += (<Text>marker[i]).string;
-				marker.splice(i, 1);
-				i--;
+					if (thisMarker.value.length > 0) {
+						compact(thisMarker.value, placeholders);
+					}
+
+				} else if (i > 0 && thisMarker instanceof Text && marker[i - 1] instanceof Text) {
+					(<Text>marker[i - 1]).string += (<Text>marker[i]).string;
+					marker.splice(i, 1);
+					i--;
+				}
 			}
 		}
 
+		compact(marker, Object.create(null));
+
 		return marker;
 	}
 
@@ -347,7 +355,7 @@ export class SnippetParser {
 			if (// Internal style
 				(this._enableInternal && (this._accept(TokenType.CurlyOpen) || this._accept(TokenType.CurlyClose) || this._accept(TokenType.Backslash)))
 				// TextMate style
-				|| (this._enableTextMate && this._accept(TokenType.Dollar))
+				|| (this._enableTextMate && (this._accept(TokenType.Dollar) || this._accept(TokenType.CurlyClose)))
 			) {
 				// just consume them
 			}

src/vs/editor/contrib/snippet/test/common/snippetParser.test.ts

@@ -127,6 +127,23 @@ suite('SnippetParser', () => {
 		assertEscape('far{{id:bern {{basel}}}}boo', 'farbern baselboo');
 		assertEscape('far{{id:bern {{id:basel}}}}boo', 'farbern baselboo');
 		assertEscape('far{{id:bern {{id2:basel}}}}boo', 'farbern baselboo');
+
+	});
+
+	test('Parser, TM escaping', () => {
+		assertEscapeAndMarker('foo${1:bar}}', 'foobar}', Text, Placeholder, Text);
+		assertEscapeAndMarker('foo${1:bar}${2:foo}}', 'foobarfoo}', Text, Placeholder, Placeholder, Text);
+
+		assertEscapeAndMarker('foo${1:bar\\}${2:foo}}', 'foobar}foo', Text, Placeholder);
+
+		let [, placeholder] = new SnippetParser(true, false).parse('foo${1:bar\\}${2:foo}}');
+		let {value} = (<Placeholder>placeholder);
+
+		assert.equal((<Placeholder>placeholder).name, '1');
+		assert.ok(value[0] instanceof Text);
+		assert.equal(value[0].toString(), 'bar}');
+		assert.ok(value[1] instanceof Placeholder);
+		assert.equal(value[1].toString(), 'foo');
 	});
 
 	test('Parser, placeholder', () => {