feat: add Range to raw elements (RawElement, ScriptElement) (#1231)

Co-authored-by: Daniel <daniel@grundel.local>

Author: dgrundel

parser/v2/raw.go

@@ -62,5 +62,6 @@ func (p rawElementParser) Parse(pi *parse.Input) (n Node, ok bool, err error) {
 	// Cut the end element.
 	_, _, _ = end.Parse(pi)
 
+	e.Range = NewRange(pi.PositionAt(start), pi.Position())
 	return e, true, nil
 }

parser/v2/raw_test.go

@@ -36,6 +36,10 @@ func TestRawElementParser(t *testing.T) {
 					},
 				},
 				Contents: "contents",
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 39, Line: 0, Col: 39},
+				},
 			},
 		},
 		{
@@ -56,6 +60,10 @@ func TestRawElementParser(t *testing.T) {
 					},
 				},
 				Contents: ignoredContent,
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 52, Line: 3, Col: 9},
+				},
 			},
 		},
 	}

parser/v2/scriptparser.go

@@ -163,6 +163,7 @@ loop:
 		}
 	}
 
+	e.Range = NewRange(pi.PositionAt(start), pi.Position())
 	return e, true, nil
 }
 

parser/v2/scriptparser_test.go

@@ -67,9 +67,14 @@ func TestScriptElementParser(t *testing.T) {
 		expected *ScriptElement
 	}{
 		{
-			name:     "script: no content",
-			input:    `<script></script>`,
-			expected: &ScriptElement{},
+			name:  "script: no content",
+			input: `<script></script>`,
+			expected: &ScriptElement{
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 17, Line: 0, Col: 17},
+				},
+			},
 		},
 		{
 			name:  "script: vbscript",
@@ -107,6 +112,10 @@ func TestScriptElementParser(t *testing.T) {
 						},
 					}, false),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 27, Line: 0, Col: 27},
+				},
 			},
 		},
 		{
@@ -133,6 +142,10 @@ func TestScriptElementParser(t *testing.T) {
 						},
 					}, false),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 50, Line: 0, Col: 50},
+				},
 			},
 		},
 		{
@@ -159,6 +172,10 @@ func TestScriptElementParser(t *testing.T) {
 						},
 					}, false),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 41, Line: 0, Col: 41},
+				},
 			},
 		},
 		{
@@ -185,6 +202,10 @@ func TestScriptElementParser(t *testing.T) {
 						},
 					}, false),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 45, Line: 0, Col: 45},
+				},
 			},
 		},
 		{
@@ -206,6 +227,10 @@ func TestScriptElementParser(t *testing.T) {
 						TrailingSpace: SpaceVertical,
 					}, false),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 29, Line: 2, Col: 9},
+				},
 			},
 		},
 		{
@@ -225,6 +250,10 @@ func TestScriptElementParser(t *testing.T) {
 					}, true),
 					NewScriptContentsScriptCode("';"),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 38, Line: 0, Col: 38},
+				},
 			},
 		},
 		{
@@ -244,6 +273,10 @@ func TestScriptElementParser(t *testing.T) {
 					}, true),
 					NewScriptContentsScriptCode("\";"),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 38, Line: 0, Col: 38},
+				},
 			},
 		},
 		{
@@ -266,6 +299,10 @@ to see if it works";</script>`,
 					}, true),
 					NewScriptContentsScriptCode("\\\nto see if it works\";"),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 76, Line: 2, Col: 29},
+				},
 			},
 		},
 		{
@@ -285,6 +322,10 @@ to see if it works";</script>`,
 					}, true),
 					NewScriptContentsScriptCode("`;"),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 38, Line: 0, Col: 38},
+				},
 			},
 		},
 		{
@@ -297,6 +338,10 @@ to see if it works";</script>`,
 					NewScriptContentsScriptCode("\n"),
 					NewScriptContentsScriptCode("// {{ name }}\n"),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 32, Line: 2, Col: 9},
+				},
 			},
 		},
 		{
@@ -311,6 +356,10 @@ but it's commented out */
 					NewScriptContentsScriptCode("\n"),
 					NewScriptContentsScriptCode("/* There's some content\n{{ name }}\nbut it's commented out */\n"),
 				},
+				Range: Range{
+					From: Position{Index: 0, Line: 0, Col: 0},
+					To:   Position{Index: 79, Line: 4, Col: 9},
+				},
 			},
 		},
 		{

parser/v2/types.go

@@ -729,6 +729,7 @@ type ScriptContents struct {
 type ScriptElement struct {
 	Attributes []Attribute
 	Contents   []ScriptContents
+	Range      Range
 }
 
 func (se *ScriptElement) IsNode() bool { return true }
@@ -793,6 +794,7 @@ type RawElement struct {
 	Name       string
 	Attributes []Attribute
 	Contents   string
+	Range      Range
 }
 
 func (e *RawElement) IsNode() bool { return true }