fixes bug 1451450, parse VariantExpressions with a MessageReference inside (#62)

This switches the props of VariantExpression from having a
string `id` to a `MessageReference` `ref`

Author: Pike

fluent/syntax/ast.py

@@ -245,9 +245,9 @@ def __init__(self, id, name, **kwargs):
 
 
 class VariantExpression(Expression):
-    def __init__(self, id, key, **kwargs):
+    def __init__(self, ref, key, **kwargs):
         super(VariantExpression, self).__init__(**kwargs)
-        self.id = id
+        self.ref = ref
         self.key = key
 
 

fluent/syntax/parser.py

@@ -518,7 +518,7 @@ def get_selector_expression(self, ps):
             ps.next()
             key = self.get_variant_key(ps)
             ps.expect_char(']')
-            return ast.VariantExpression(literal.id, key)
+            return ast.VariantExpression(literal, key)
 
         if (ch == '('):
             ps.next()

fluent/syntax/serializer.py

@@ -235,7 +235,7 @@ def serialize_attribute_expression(expr):
 
 def serialize_variant_expression(expr):
     return "{}[{}]".format(
-        serialize_identifier(expr.id),
+        serialize_expression(expr.ref),
         serialize_variant_key(expr.key),
     )
 

tests/syntax/fixtures_structure/term.json

@@ -189,9 +189,17 @@
             "type": "Placeable",
             "expression": {
               "type": "VariantExpression",
-              "id": {
-                "type": "Identifier",
-                "name": "-brand-name",
+              "ref": {
+                "type": "MessageReference",
+                "id": {
+                  "type": "Identifier",
+                  "name": "-brand-name",
+                  "span": {
+                    "type": "Span",
+                    "start": 145,
+                    "end": 156
+                  }
+                },
                 "span": {
                   "type": "Span",
                   "start": 145,