support multiple variables in @each (for microsoft/vscode#1758)

microsoft · Jan 23, 2017 · 505085c · 505085c
1 parent 2d79855
commit 505085c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/parser/scssParser.ts b/src/parser/scssParser.ts
@@ -340,6 +340,11 @@ export class SCSSParser extends cssParser.Parser {
 		if (!node.setVariable(this._parseVariable())) {
 			return this.finish(node, ParseError.VariableNameExpected, [TokenType.CurlyR]);
 		}
+		while (this.accept(TokenType.Comma)) {
+			if (!node.setVariable(this._parseVariable())) {
+				return this.finish(node, ParseError.VariableNameExpected, [TokenType.CurlyR]);
+			}
+		}
 		if (!this.accept(TokenType.Ident, 'in')) {
 			return this.finish(node, SCSSParseError.InExpected, [TokenType.CurlyR]);
 		}

diff --git a/src/test/scss/parser.test.ts b/src/test/scss/parser.test.ts
@@ -231,9 +231,11 @@ suite('SCSS - Parser', () => {
 		let parser = new SCSSParser();
 		assertNode('@each $i in 1, 2, 3 { }', parser, parser._parseRuleSetDeclaration.bind(parser));
 		assertNode('@each $i in 1 2 3 { }', parser, parser._parseRuleSetDeclaration.bind(parser));
+		assertNode('@each $animal, $color, $cursor in (puma, black, default), (egret, white, move) {}', parser, parser._parseRuleSetDeclaration.bind(parser));
 		assertError('@each i in 4 {}', parser, parser._parseRuleSetDeclaration.bind(parser), ParseError.VariableNameExpected);
 		assertError('@each $i from 4 {}', parser, parser._parseRuleSetDeclaration.bind(parser), SCSSParseError.InExpected);
 		assertError('@each $i in {}', parser, parser._parseRuleSetDeclaration.bind(parser), ParseError.ExpressionExpected);
+		assertError('@each $animal,  in (1, 1, 1), (2, 2, 2) {}', parser, parser._parseRuleSetDeclaration.bind(parser), ParseError.VariableNameExpected);
 	});
 
 	test('@while', function () {