feat: add start column and end column to position struct

internal/php7/lexer.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"strings"
 
+	pos "github.com/VKCOM/php-parser/internal/position"
 	"github.com/VKCOM/php-parser/pkg/conf"
 	"github.com/VKCOM/php-parser/pkg/errors"
 	"github.com/VKCOM/php-parser/pkg/position"
@@ -24,7 +25,7 @@ type Lexer struct {
 	heredocLabel []byte
 	tokenPool    *token.Pool
 	positionPool *position.Pool
-	newLines     NewLines
+	newLines     pos.NewLines
 }
 
 func NewLexer(data []byte, config conf.Config) *Lexer {
@@ -38,7 +39,7 @@ func NewLexer(data []byte, config conf.Config) *Lexer {
 
 		tokenPool:    token.NewPool(position.DefaultBlockSize),
 		positionPool: position.NewPool(token.DefaultBlockSize),
-		newLines:     NewLines{make([]int, 0, 128)},
+		newLines:     pos.NewNewLines(),
 	}
 
 	initLexer(lex)
@@ -49,10 +50,15 @@ func NewLexer(data []byte, config conf.Config) *Lexer {
 func (lex *Lexer) setTokenPosition(token *token.Token) {
 	pos := lex.positionPool.Get()
 
-	pos.StartLine = lex.newLines.GetLine(lex.ts)
-	pos.EndLine = lex.newLines.GetLine(lex.te - 1)
+	sl, slb := lex.newLines.GetLine(lex.ts)
+	el, elb := lex.newLines.GetLine(lex.te - 1)
+
+	pos.StartLine = sl
+	pos.EndLine = el
 	pos.StartPos = lex.ts
 	pos.EndPos = lex.te
+	pos.StartCol = lex.ts - slb
+	pos.EndCol = lex.te - elb
 
 	token.Position = pos
 }
@@ -232,11 +238,15 @@ func (lex *Lexer) error(msg string) {
 		return
 	}
 
+	sl, slb := lex.newLines.GetLine(lex.ts)
+	el, elb := lex.newLines.GetLine(lex.te - 1)
 	pos := position.NewPosition(
-		lex.newLines.GetLine(lex.ts),
-		lex.newLines.GetLine(lex.te-1),
+		sl,
+		el,
 		lex.ts,
 		lex.te,
+		lex.ts-slb,
+		lex.te-elb,
 	)
 
 	lex.errHandlerFunc(errors.NewError(msg, pos))

internal/php7/newline.go

@@ -1,25 +0,0 @@
-package php7
-
-type NewLines struct {
-	data []int
-}
-
-func (nl *NewLines) Append(p int) {
-	if len(nl.data) == 0 || nl.data[len(nl.data)-1] < p {
-		nl.data = append(nl.data, p)
-	}
-}
-
-func (nl *NewLines) GetLine(p int) int {
-	line := len(nl.data) + 1
-
-	for i := len(nl.data) - 1; i >= 0; i-- {
-		if p < nl.data[i] {
-			line = i + 1
-		} else {
-			break
-		}
-	}
-
-	return line
-}

internal/php7/parser_test.go

@@ -14,6 +14,11 @@ import (
 	"github.com/VKCOM/php-parser/pkg/version"
 )
 
+func TestMain(m *testing.M) {
+	// Ignore StartCol and EndCol in equality checks, these tests were written before they were added.
+	position.CheckColEquality = false
+}
+
 func TestIdentifier(t *testing.T) {
 	src := `<? $foo;`