feat: add Ranges to IfExpression and ElseIfExpressionparser nodes (#1248)

Author: dgrundel

parser/v2/ifexpressionparser.go

@@ -67,6 +67,7 @@ func (ifExpressionParser) Parse(pi *parse.Input) (n Node, matched bool, err erro
 		return r, true, parse.Error("if: expected closing brace", pi.Position())
 	}
 
+	r.Range = NewRange(pi.PositionAt(start), pi.Position())
 	return r, true, nil
 }
 
@@ -108,6 +109,7 @@ func (elseIfExpressionParser) Parse(pi *parse.Input) (r ElseIfExpression, matche
 	}
 	r.Then = thenNodes.Nodes
 
+	r.Range = NewRange(pi.PositionAt(start), pi.Position())
 	return r, true, nil
 }
 

parser/v2/ifexpressionparser_test.go

@@ -74,6 +74,10 @@ func TestIfExpression(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 49, Line: 4, Col: 1},
+				},
 			},
 		},
 		{
@@ -140,6 +144,10 @@ func TestIfExpression(t *testing.T) {
 						TrailingSpace: SpaceVertical,
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 37, Line: 4, Col: 1},
+				},
 			},
 		},
 		{
@@ -175,6 +183,10 @@ func TestIfExpression(t *testing.T) {
 						TrailingSpace: SpaceVertical,
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 21, Line: 2, Col: 1},
+				},
 			},
 		},
 		{
@@ -238,6 +250,10 @@ func TestIfExpression(t *testing.T) {
 						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 49, Line: 4, Col: 1},
+				},
 			},
 		},
 		{
@@ -304,6 +320,10 @@ func TestIfExpression(t *testing.T) {
 						TrailingSpace: SpaceVertical,
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 36, Line: 4, Col: 1},
+				},
 			},
 		},
 		{
@@ -382,9 +402,17 @@ func TestIfExpression(t *testing.T) {
 								},
 							},
 						},
+						Range: Range{
+							From: Position{Index: 14, Line: 1, Col: 5},
+							To:   Position{Index: 54, Line: 3, Col: 6},
+						},
 					},
 					&Whitespace{Value: "\n\t\t\t\t"},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 60, Line: 4, Col: 5},
+				},
 			},
 		},
 		{
@@ -437,8 +465,16 @@ func TestIfExpression(t *testing.T) {
 								TrailingSpace: SpaceVertical,
 							},
 						},
+						Range: Range{
+							From: Position{Index: 18, Line: 2, Col: 0},
+							To:   Position{Index: 43, Line: 4, Col: 0},
+						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 44, Line: 4, Col: 1},
+				},
 			},
 		},
 		{
@@ -493,6 +529,10 @@ func TestIfExpression(t *testing.T) {
 								TrailingSpace: SpaceVertical,
 							},
 						},
+						Range: Range{
+							From: Position{Index: 18, Line: 2, Col: 0},
+							To:   Position{Index: 43, Line: 4, Col: 0},
+						},
 					},
 					{
 						Expression: Expression{
@@ -515,8 +555,16 @@ func TestIfExpression(t *testing.T) {
 								TrailingSpace: SpaceVertical,
 							},
 						},
+						Range: Range{
+							From: Position{Index: 43, Line: 4, Col: 0},
+							To:   Position{Index: 68, Line: 6, Col: 0},
+						},
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 69, Line: 6, Col: 1},
+				},
 			},
 		},
 		{
@@ -573,6 +621,10 @@ func TestIfExpression(t *testing.T) {
 								TrailingSpace: SpaceVertical,
 							},
 						},
+						Range: Range{
+							From: Position{Index: 18, Line: 2, Col: 0},
+							To:   Position{Index: 43, Line: 4, Col: 0},
+						},
 					},
 					{
 						Expression: Expression{
@@ -595,6 +647,10 @@ func TestIfExpression(t *testing.T) {
 								TrailingSpace: SpaceVertical,
 							},
 						},
+						Range: Range{
+							From: Position{Index: 43, Line: 4, Col: 0},
+							To:   Position{Index: 68, Line: 6, Col: 0},
+						},
 					},
 				},
 				Else: []Node{
@@ -609,6 +665,10 @@ func TestIfExpression(t *testing.T) {
 						TrailingSpace: SpaceVertical,
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 87, Line: 8, Col: 1},
+				},
 			},
 		},
 		{
@@ -666,6 +726,10 @@ func TestIfExpression(t *testing.T) {
 						TrailingSpace: SpaceVertical,
 					},
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 54, Line: 4, Col: 2},
+				},
 			},
 		},
 	}

parser/v2/templateparser_test.go

@@ -450,6 +450,10 @@ func TestTemplateParser(t *testing.T) {
 								},
 							},
 						},
+						Range: Range{
+							From: Position{Index: 27, Line: 1, Col: 1},
+							To:   Position{Index: 82, Line: 5, Col: 2},
+						},
 					},
 					&Whitespace{
 						Value: "\n",

parser/v2/types.go

@@ -1260,11 +1260,13 @@ type IfExpression struct {
 	Then       []Node
 	ElseIfs    []ElseIfExpression
 	Else       []Node
+	Range      Range
 }
 
 type ElseIfExpression struct {
 	Expression Expression
 	Then       []Node
+	Range      Range
 }
 
 func (n IfExpression) ChildNodes() []Node {