support metadata in var declaration syntax HaxeFoundation/haxe#9618

AlexHaxe · Jun 27, 2020 · 32e79ee · 32e79ee
1 parent b62ff77
commit 32e79ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/haxeparser/HaxeParser.hx b/src/haxeparser/HaxeParser.hx
@@ -1283,10 +1283,10 @@ class HaxeParser extends hxparse.Parser<HaxeTokenSource, Token> implements hxpar
 
 	function parseVarDecl(isFinal:Bool) {
 		return switch stream {
-			case [id = dollarIdent(), t = parseTypeOpt()]:
+			case [meta = parseMeta(), id = dollarIdent(), t = parseTypeOpt()]:
 				switch stream {
-					case [{tok:Binop(OpAssign)}, e = expr()]: { name: id.name, type: t, expr: e, isFinal: isFinal};
-					case _: { name: id.name, type:t, expr: null, isFinal: isFinal};
+					case [{tok:Binop(OpAssign)}, e = expr()]: { name: id.name, type: t, expr: e, isFinal: isFinal, meta: meta};
+					case _: { name: id.name, type:t, expr: null, isFinal: isFinal, meta: meta};
 				}
 		}
 	}

diff --git a/test/Test.hx b/test/Test.hx
@@ -548,6 +548,10 @@ class Test extends haxe.unit.TestCase {
 		peq("private typedef D2 = A & B;", "typedef D2 = A & B;");
 	}
 
+	function testMetadataVarDecl() {
+		eeq("var @:a(b) c:D = e");
+	}
+
 	static function parseExpr(inputCode:String, ?p:haxe.PosInfos) {
 		var parser = new haxeparser.HaxeParser(byte.ByteData.ofString(inputCode), '${p.methodName}:${p.lineNumber}');
 		var expr = parser.expr();