feat: add Range to TemplElementExpression (#1276)

Author: dgrundel

parser/v2/templateparser_test.go

@@ -668,6 +668,10 @@ func TestTemplateParser(t *testing.T) {
 										},
 									},
 								},
+								Range: Range{
+									From: Position{Index: 26, Line: 1, Col: 14},
+									To:   Position{Index: 47, Line: 1, Col: 35},
+								},
 							},
 							&Whitespace{Value: " "},
 							&Text{

parser/v2/templelementparser.go

@@ -8,6 +8,8 @@ import (
 type templElementExpressionParser struct{}
 
 func (p templElementExpressionParser) Parse(pi *parse.Input) (n Node, matched bool, err error) {
+	start := pi.Position()
+
 	// Check the prefix first.
 	if _, matched, err = parse.Rune('@').Parse(pi); err != nil || !matched {
 		return nil, false, nil
@@ -26,6 +28,7 @@ func (p templElementExpressionParser) Parse(pi *parse.Input) (n Node, matched bo
 		return
 	}
 	if !hasOpenBrace {
+		r.Range = NewRange(start, pi.Position())
 		return r, true, nil
 	}
 
@@ -48,6 +51,8 @@ func (p templElementExpressionParser) Parse(pi *parse.Input) (n Node, matched bo
 		return r, true, err
 	}
 
+	r.Range = NewRange(start, pi.Position())
+
 	return r, true, nil
 }
 

parser/v2/templelementparser_test.go

@@ -32,6 +32,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 14, Line: 0, Col: 14},
+				},
 			},
 		},
 		{
@@ -53,6 +57,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 24, Line: 0, Col: 24},
+				},
 			},
 		},
 		{
@@ -80,6 +88,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 60, Line: 3, Col: 4},
+				},
 			},
 		},
 		{
@@ -114,6 +126,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						TrailingSpace: SpaceVertical,
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 30, Line: 2, Col: 1},
+				},
 			},
 		},
 		{
@@ -164,6 +180,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 43, Line: 2, Col: 3},
+				},
 			},
 		},
 		{
@@ -197,9 +217,17 @@ func TestTemplElementExpressionParser(t *testing.T) {
 								To:   Position{28, 1, 11},
 							},
 						},
+						Range: Range{
+							From: Position{Index: 21, Line: 1, Col: 4},
+							To:   Position{Index: 28, Line: 1, Col: 11},
+						},
 					},
 					&Whitespace{Value: "\n\t\t\t"},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 33, Line: 2, Col: 4},
+				},
 			},
 		},
 		{
@@ -222,6 +250,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 21, Line: 0, Col: 21},
+				},
 			},
 		},
 		{
@@ -243,6 +275,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 31, Line: 0, Col: 31},
+				},
 			},
 		},
 		{
@@ -264,6 +300,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 31, Line: 0, Col: 31},
+				},
 			},
 		},
 		{
@@ -285,6 +325,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 15, Line: 0, Col: 15},
+				},
 			},
 		},
 		{
@@ -306,6 +350,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 19, Line: 0, Col: 19},
+				},
 			},
 		},
 		{
@@ -327,6 +375,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 30, Line: 0, Col: 30},
+				},
 			},
 		},
 		{
@@ -348,6 +400,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 30, Line: 0, Col: 30},
+				},
 			},
 		},
 		{
@@ -369,6 +425,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 9, Line: 0, Col: 9},
+				},
 			},
 		},
 		{
@@ -382,6 +442,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						To:   Position{33, 0, 33},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 33, Line: 0, Col: 33},
+				},
 			},
 		},
 		{
@@ -421,6 +485,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 56, Line: 2, Col: 1},
+				},
 			},
 		},
 		{
@@ -440,6 +508,10 @@ func TestTemplElementExpressionParser(t *testing.T) {
 						To:   Position{50, 3, 2},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 50, Line: 3, Col: 2},
+				},
 			},
 		},
 	}

parser/v2/types.go

@@ -1181,6 +1181,7 @@ type TemplElementExpression struct {
 	Expression Expression
 	// Children returns the elements in a block element.
 	Children []Node
+	Range    Range
 }
 
 func (tee TemplElementExpression) ChildNodes() []Node {