start with fwdslash token, #6920

microsoft · Jul 14, 2017 · c1d6786 · c1d6786
1 parent d4fae70
commit c1d6786
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/vs/editor/contrib/snippet/browser/snippetParser.ts b/src/vs/editor/contrib/snippet/browser/snippetParser.ts
@@ -13,6 +13,7 @@ export enum TokenType {
 	CurlyOpen,
 	CurlyClose,
 	Backslash,
+	Forwardslash,
 	Int,
 	VariableName,
 	Format,
@@ -34,6 +35,7 @@ export class Scanner {
 		[CharCode.OpenCurlyBrace]: TokenType.CurlyOpen,
 		[CharCode.CloseCurlyBrace]: TokenType.CurlyClose,
 		[CharCode.Backslash]: TokenType.Backslash,
+		[CharCode.Slash]: TokenType.Forwardslash
 	};
 
 	static isDigitCharacter(ch: number): boolean {

diff --git a/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts b/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
@@ -76,6 +76,19 @@ suite('SnippetParser', () => {
 		assert.equal(scanner.next().type, TokenType.Dollar);
 		assert.equal(scanner.next().type, TokenType.CurlyOpen);
 		assert.equal(scanner.next().type, TokenType.CurlyClose);
+
+		scanner.text('${foo/regex/format/option}');
+		assert.equal(scanner.next().type, TokenType.Dollar);
+		assert.equal(scanner.next().type, TokenType.CurlyOpen);
+		assert.equal(scanner.next().type, TokenType.VariableName);
+		assert.equal(scanner.next().type, TokenType.Forwardslash);
+		assert.equal(scanner.next().type, TokenType.VariableName);
+		assert.equal(scanner.next().type, TokenType.Forwardslash);
+		assert.equal(scanner.next().type, TokenType.VariableName);
+		assert.equal(scanner.next().type, TokenType.Forwardslash);
+		assert.equal(scanner.next().type, TokenType.VariableName);
+		assert.equal(scanner.next().type, TokenType.CurlyClose);
+		assert.equal(scanner.next().type, TokenType.EOF);
 	});
 
 	function assertText(value: string, expected: string) {