feat: add GetFilePositionFor

Author: ldez

pkg/goanalysis/position.go

@@ -0,0 +1,44 @@
+package goanalysis
+
+import (
+	"go/ast"
+	"go/token"
+	"path/filepath"
+
+	"golang.org/x/tools/go/analysis"
+)
+
+func GetFilePosition(pass *analysis.Pass, f *ast.File) token.Position {
+	return GetFilePositionFor(pass.Fset, f.Pos())
+}
+
+func GetFilePositionFor(fset *token.FileSet, p token.Pos) token.Position {
+	pos := fset.PositionFor(p, true)
+
+	ext := filepath.Ext(pos.Filename)
+	if ext != ".go" {
+		// position has been adjusted to a non-go file, revert to original file
+		return fset.PositionFor(p, false)
+	}
+
+	return pos
+}
+
+func EndOfLinePos(f *token.File, line int) token.Pos {
+	var end token.Pos
+
+	if line == f.LineCount() {
+		// missing newline at the end of the file
+		end = f.Pos(f.Size())
+	} else {
+		end = f.LineStart(line+1) - token.Pos(1)
+	}
+
+	return end
+}
+
+// AdjustPos is a hack to get the right line to display.
+// It should not be used outside some specific cases.
+func AdjustPos(line, nonAdjLine, adjLine int) int {
+	return line + nonAdjLine - adjLine
+}

pkg/golinters/internal/util.go

@@ -2,12 +2,12 @@ package internal
 
 import (
 	"fmt"
-	"path/filepath"
 	"strings"
 
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
+	"github.com/golangci/golangci-lint/pkg/goanalysis"
 )
 
 func FormatCode(code string, _ *config.Config) string {
@@ -19,15 +19,9 @@ func FormatCode(code string, _ *config.Config) string {
 }
 
 func GetFileNames(pass *analysis.Pass) []string {
-	var fileNames []string
+	var filenames []string
 	for _, f := range pass.Files {
-		fileName := pass.Fset.PositionFor(f.Pos(), true).Filename
-		ext := filepath.Ext(fileName)
-		if ext != "" && ext != ".go" {
-			// position has been adjusted to a non-go file, revert to original file
-			fileName = pass.Fset.PositionFor(f.Pos(), false).Filename
-		}
-		fileNames = append(fileNames, fileName)
+		filenames = append(filenames, goanalysis.GetFilePosition(pass, f).Filename)
 	}
-	return fileNames
+	return filenames
 }