lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: ast, interfaces, interpolate: Remove the legacy pos

Browse Source 
This ports things to the new textarea. We need to plumb through things a
lot more, especially the string interpolation math to get the right
offsets everywhere, but that's coming.
This commit is contained in:
James Shubin
2025-06-06 00:58:30 -04:00
parent 86dfa5844a
commit cdc6743d83
4 changed files with 12 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lang/interpolate/interpolate.go
View File

@@ -57,21 +57,21 @@ const (
// StrInterpolate interpolates a string and returns the representative AST. If
// there was nothing to interpolate, this returns (nil, nil).
func StrInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) {
func StrInterpolate(str string, textarea *interfaces.Textarea, data *interfaces.Data) (interfaces.Expr, error) {
if data.Debug {
data.Logf("interpolating: %s", str)
}
if UseHilInterpolation {
return HilInterpolate(str, pos, data)
return HilInterpolate(str, textarea, data)
}
return RagelInterpolate(str, pos, data)
return RagelInterpolate(str, textarea, data)
}
// RagelInterpolate interpolates a string and returns the representative AST. It
// uses the ragel parser to perform the string interpolation. If there was
// nothing to interpolate, this returns (nil, nil).
func RagelInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) {
func RagelInterpolate(str string, textarea *interfaces.Textarea, data *interfaces.Data) (interfaces.Expr, error) {
sequence, err := Parse(str)
if err != nil {
return nil, errwrap.Wrapf(err, "parser failed")
@@ -125,13 +125,14 @@ func RagelInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (i
// HilInterpolate interpolates a string and returns the representative AST. This
// particular implementation uses the hashicorp hil library and syntax to do so.
func HilInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) {
func HilInterpolate(str string, textarea *interfaces.Textarea, data *interfaces.Data) (interfaces.Expr, error) {
var line, column int = -1, -1
var filename string
if pos != nil {
line = pos.Line
column = pos.Column
filename = pos.Filename
if textarea != nil {
startLine, startColumn := textarea.Pos() // zero based
line = startLine
column = startColumn
filename = textarea.Filename() // TODO: .Path() instead?
}
hilPos := hilast.Pos{
Line: line,