Fixes microsoft#3552: Parse \$ as $ in TM snippets

hackur · Mar 17, 2016 · 42f6a50 · 42f6a50
1 parent 8bc67cb
commit 42f6a50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/vs/editor/contrib/snippet/common/snippet.ts b/src/vs/editor/contrib/snippet/common/snippet.ts
@@ -282,7 +282,11 @@ export class CodeSnippet implements ICodeSnippet {
 			// Escapes
 			if (/^\\./.test(restOfLine)) {
 				i += 2;
-				convertedSnippet += restOfLine.substr(0, 2);
+				if (/^\\\$/.test(restOfLine)) {
+					convertedSnippet += '$';
+				} else {
+					convertedSnippet += restOfLine.substr(0, 2);
+				}
 				continue;
 			}
 

diff --git a/src/vs/editor/contrib/snippet/test/common/snippet.test.ts b/src/vs/editor/contrib/snippet/test/common/snippet.test.ts
@@ -75,5 +75,13 @@ suite('Editor Contrib - Snippets', () => {
 		assert.equal(snippet.placeHolders[1].occurences.length, 1);
 		assert.deepEqual(snippet.placeHolders[1].occurences[0], new Range(2, 2, 2, 2));
 	});
+
+	test('issue #3552: Snippet Converted Not Working for literal Dollar Sign', () => {
+
+		let external = '\n\\$scope.\\$broadcast(\'scroll.infiniteScrollComplete\');\n';
+		let internal = CodeSnippet.convertExternalSnippet(external, ExternalSnippetType.TextMateSnippet);
+
+		assert.equal(internal, '\n$scope.$broadcast(\'scroll.infiniteScrollComplete\');\n');
+	});
 });