add SrcRange to ExprSyntaxError

hashicorp · Mar 13, 2024 · 54e4175 · 54e4175
1 parent 53ee54e
commit 54e4175
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/hclsyntax/expression.go b/hclsyntax/expression.go
@@ -2019,6 +2019,7 @@ func (e *AnonSymbolExpr) StartRange() hcl.Range {
 type ExprSyntaxError struct {
 	Placeholder cty.Value
 	ParseDiags  hcl.Diagnostics
+	SrcRange    hcl.Range
 }
 
 func (e *ExprSyntaxError) Value(ctx *hcl.EvalContext) (cty.Value, hcl.Diagnostics) {
@@ -2030,9 +2031,9 @@ func (e *ExprSyntaxError) walkChildNodes(w internalWalkFunc) {
 }
 
 func (e *ExprSyntaxError) Range() hcl.Range {
-	return hcl.Range{}
+	return e.SrcRange
 }
 
 func (e *ExprSyntaxError) StartRange() hcl.Range {
-	return hcl.Range{}
+	return e.SrcRange
 }
diff --git a/hclsyntax/parser.go b/hclsyntax/parser.go
@@ -1173,6 +1173,7 @@ func (p *parser) finishParsingFunctionCall(name Token) (Expression, hcl.Diagnost
 			return &ExprSyntaxError{
 				ParseDiags:  hcl.Diagnostics{&diag},
 				Placeholder: cty.DynamicVal,
+				SrcRange:    hcl.RangeBetween(name.Range, nextName.Range),
 			}, diags
 		}
 
@@ -1209,6 +1210,7 @@ func (p *parser) finishParsingFunctionCall(name Token) (Expression, hcl.Diagnost
 		return &ExprSyntaxError{
 			ParseDiags:  hcl.Diagnostics{&diag},
 			Placeholder: cty.DynamicVal,
+			SrcRange:    hcl.RangeBetween(name.Range, openTok.Range),
 		}, diags
 	}
 

diff --git a/hclsyntax/parser_test.go b/hclsyntax/parser_test.go
@@ -2583,6 +2583,10 @@ block "valid" {}
 									},
 								},
 							},
+							SrcRange: hcl.Range{
+								Start: hcl.Pos{Line: 1, Column: 5, Byte: 4},
+								End:   hcl.Pos{Line: 2, Column: 1, Byte: 24},
+							},
 						},
 						SrcRange: hcl.Range{
 							Filename: "",
@@ -2636,6 +2640,10 @@ block "valid" {}
 									},
 								},
 							},
+							SrcRange: hcl.Range{
+								Start: hcl.Pos{Line: 1, Column: 5, Byte: 4},
+								End:   hcl.Pos{Line: 2, Column: 1, Byte: 14},
+							},
 						},
 						SrcRange: hcl.Range{
 							Filename: "",