fix: cache countLines during export

Author: Hoblovski

lang/collect/export.go

@@ -44,11 +44,12 @@ func (c *Collector) fileLine(loc Location) uniast.FileLine {
 		rel = filepath.Base(loc.URI.File())
 	}
 	text := c.cli.GetFile(loc.URI).Text
+	uri_str := string(loc.URI)
 	return uniast.FileLine{
 		File:        rel,
 		Line:        loc.Range.Start.Line,
-		StartOffset: lsp.PositionOffset(text, loc.Range.Start),
-		EndOffset:   lsp.PositionOffset(text, loc.Range.End),
+		StartOffset: lsp.PositionOffsetIdentified(uri_str, text, loc.Range.Start),
+		EndOffset:   lsp.PositionOffsetIdentified(uri_str, text, loc.Range.End),
 	}
 }
 

lang/cxx/spec.go

@@ -164,7 +164,7 @@ func (c *CxxSpec) FunctionSymbol(sym lsp.DocumentSymbol) (int, []int, []int, []i
 	// TODO: attributes may contain parens. also inline structs.
 
 	endRelOffset := 0
-	lines := utils.CountLinesCached(sym.Text)
+	lines := utils.CountLinesPooled(sym.Text)
 	phase := 0
 	for i, tok := range sym.Tokens {
 		switch phase {

lang/lsp/utils.go

@@ -36,7 +36,7 @@ import (
 )
 
 func GetDistance(text string, start Position, pos Position) int {
-	lines := utils.CountLinesCached(text)
+	lines := utils.CountLinesPooled(text)
 	defer utils.PutCount(lines)
 	// find the line of the position
 	return (*lines)[pos.Line-start.Line] + pos.Character - start.Character
@@ -59,12 +59,23 @@ func RelativePostionWithLines(lines []int, textPos Position, pos Position) int {
 	return lines[l] + pos.Character - textPos.Character
 }
 
+func PositionOffsetIdentified(uri string, text string, pos Position) int {
+	if pos.Line < 0 || pos.Character < 0 {
+		log.Error("invalid text position: %+v", pos)
+		return -1
+	}
+	lines := utils.CountLinesCached(uri, text)
+	defer utils.PutCount(lines)
+
+	return RelativePostionWithLines(*lines, Position{Line: 0, Character: 0}, pos)
+}
+
 func PositionOffset(text string, pos Position) int {
 	if pos.Line < 0 || pos.Character < 0 {
 		log.Error("invalid text position: %+v", pos)
 		return -1
 	}
-	lines := utils.CountLinesCached(text)
+	lines := utils.CountLinesPooled(text)
 	defer utils.PutCount(lines)
 
 	return RelativePostionWithLines(*lines, Position{Line: 0, Character: 0}, pos)

lang/rust/spec.go

@@ -261,7 +261,7 @@ func (c *RustSpec) FunctionSymbol(sym lsp.DocumentSymbol) (int, []int, []int, []
 	if where == -1 {
 		where = len(tokens) - 1
 	}
-	lines := utils.CountLinesCached(sym.Text)
+	lines := utils.CountLinesPooled(sym.Text)
 
 	// find the typeParam's type token between "fn" and "("
 	var typeParams []int

lang/utils/strings.go

@@ -28,7 +28,19 @@ func PutCount(count *[]int) {
 	countPool.Put(count)
 }
 
-func CountLinesCached(text string) *[]int {
+var cachedLines = sync.Map{}
+
+func CountLinesCached(ident string, text string) *[]int {
+	if v, ok := cachedLines.Load(ident); ok {
+		res := v.([]int)
+		return &res
+	}
+	tmp := CountLines(text)
+	cachedLines.Store(ident, tmp)
+	return &tmp
+}
+
+func CountLinesPooled(text string) *[]int {
 	tmp := countPool.Get().(*[]int)
 	*tmp = append(*tmp, 0)
 	for i, c := range text {