Test shorthand indexes with case tags

Author: jg-rp

liquid/builtin/tags/case_tag.py

@@ -1,4 +1,5 @@
 """Tag and node definition for the built-in "case" tag."""
+
 from __future__ import annotations
 
 import sys
@@ -193,14 +194,16 @@ def parse(self, stream: TokenStream) -> ast.Node:
 
     def _parse_case_expression(self, expr: str, linenum: int) -> Expression:
         stream = ExpressionTokenStream(
-            tokenize_common_expression(expr, linenum=linenum)
+            tokenize_common_expression(expr, linenum=linenum),
+            shorthand_indexes=self.env.shorthand_indexes,
         )
         return parse_common_expression(stream)
 
     def _parse_when_expression(self, expr: str, linenum: int) -> List[Expression]:
         expressions = []
         stream = ExpressionTokenStream(
-            tokenize_common_expression(expr, linenum=linenum)
+            tokenize_common_expression(expr, linenum=linenum),
+            shorthand_indexes=self.env.shorthand_indexes,
         )
 
         while True:

liquid/expressions/common.py

@@ -254,6 +254,8 @@ def _parse_range_literal(stream: "TokenStream") -> RangeLiteral:
         TOKEN_IDENTINDEX,
         TOKEN_DOT,
         TOKEN_LBRACKET,
+        TOKEN_INTEGER,
+        TOKEN_FLOAT,
     )
 )
 
@@ -267,7 +269,7 @@ def _parse_common_identifier(stream: "TokenStream") -> Identifier:
     path: IdentifierPath = []
 
     while True:
-        _, _type, value = stream.current
+        pos, _type, value = stream.current
         if _type == TOKEN_IDENTIFIER:
             path.append(IdentifierPathElement(value))
         elif _type == TOKEN_IDENTINDEX:
@@ -277,6 +279,19 @@ def _parse_common_identifier(stream: "TokenStream") -> Identifier:
             path.append(_parse_common_identifier(stream))
             stream.next_token()
             stream.expect(TOKEN_RBRACKET)
+        elif _type == TOKEN_FLOAT:
+            if stream.shorthand_indexes:
+                path.extend(
+                    IdentifierPathElement(to_int(i))
+                    for i in value.rstrip(".").split(".")
+                )
+            else:
+                raise LiquidSyntaxError(
+                    f"expected an identifier, found {value!r}",
+                    linenum=pos,
+                )
+        elif _type == TOKEN_INTEGER and stream.shorthand_indexes:
+            path.append(IdentifierPathElement(to_int(value)))
         elif _type == TOKEN_DOT:
             pass
 

tests/test_shorthand_indexes.py

@@ -57,6 +57,14 @@ def test_shorthand_index_in_conditional_expression() -> None:
     assert template.render(**data) == ""
 
 
+def test_shorthand_indexes_in_case_tag() -> None:
+    data = {"foo": ["World", "Liquid"]}
+    template = ENV.from_string(
+        "{% case foo.0 %}{% when 'World' %}Hello, World!{% endcase %}"
+    )
+    assert template.render(**data) == "Hello, World!"
+
+
 def test_shorthand_indexes_in_ternary_expressions() -> None:
     env = MockEnv()
     add_inline_expression_tags(env)