feat: add Range to CallTemplateExpression nodes (#1275)

Author: dgrundel

parser/v2/calltemplateparser.go

@@ -12,6 +12,8 @@ var callTemplateExpressionStart = parse.Or(parse.String("{! "), parse.String("{!
 type callTemplateExpressionParser struct{}
 
 func (p callTemplateExpressionParser) Parse(pi *parse.Input) (n Node, ok bool, err error) {
+	start := pi.Position()
+
 	// Check the prefix first.
 	if _, ok, err = callTemplateExpressionStart.Parse(pi); err != nil || !ok {
 		return
@@ -29,5 +31,7 @@ func (p callTemplateExpressionParser) Parse(pi *parse.Input) (n Node, ok bool, e
 		return
 	}
 
+	r.Range = NewRange(start, pi.Position())
+
 	return r, true, nil
 }

parser/v2/calltemplateparser_test.go

@@ -32,6 +32,10 @@ func TestCallTemplateExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 18, Line: 0, Col: 18},
+				},
 			},
 		},
 		{
@@ -53,6 +57,10 @@ func TestCallTemplateExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 17, Line: 0, Col: 17},
+				},
 			},
 		},
 		{
@@ -74,6 +82,10 @@ func TestCallTemplateExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 16, Line: 0, Col: 16},
+				},
 			},
 		},
 	}

parser/v2/types.go

@@ -1159,6 +1159,7 @@ func (c *HTMLComment) Visit(v Visitor) error {
 type CallTemplateExpression struct {
 	// Expression returns a template to execute.
 	Expression Expression
+	Range      Range
 }
 
 func (cte *CallTemplateExpression) IsNode() bool { return true }