fix: don't allow whitespace between selector-expressions

ngalaiko · May 2, 2024 · 581d886 · 581d886
1 parent 17144a7
commit 581d886
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/make_grammar.js b/make_grammar.js
@@ -306,8 +306,9 @@ module.exports = function make_grammar(dialect) {
                 prec(
                     PREC.primary,
                     seq(
-                        field('operand', $._pipeline),
-                        '.',
+                        field('operand',
+                            choice($.parenthesized_pipeline, $.field, $.variable, $.selector_expression)),
+                        token.immediate('.'),
                         field('field', $._field_identifier)
                     )
                 ),

diff --git a/test/corpus/arguments.txt b/test/corpus/arguments.txt
@@ -96,3 +96,16 @@ Named variable with chained field
                 (identifier))
             (field_identifier))
         (field_identifier)))
+
+====================================
+Two fields seperated by whitespace / method call with field as argument
+====================================
+{{ .Field .Field }}
+---
+(template
+  (method_call
+    (field
+      (identifier))
+    (argument_list
+      (field
+        (identifier)))))
diff --git a/test/corpus/pipelines.txt b/test/corpus/pipelines.txt
@@ -102,3 +102,15 @@ Method on a field with arguments
                     (identifier))
                 (field_identifier))
             (int_literal))))
+
+====================================
+Selector expression on a parenthesized pipeline
+====================================
+{{ (pipeline).Field }}
+---
+(template
+  (selector_expression
+    (parenthesized_pipeline
+      (function_call
+        (identifier)))
+    (field_identifier)))