Merge pull request #215 from rmohr/comments-before-package

Calculate correct position with comments before the package keyword

errcheck/analyzer.go

@@ -3,7 +3,6 @@ package errcheck
 import (
 	"fmt"
 	"go/ast"
-	"go/token"
 	"reflect"
 	"regexp"
 
@@ -66,7 +65,7 @@ func runAnalyzer(pass *analysis.Pass) (interface{}, error) {
 
 		for _, err := range v.errors {
 			pass.Report(analysis.Diagnostic{
-				Pos:     token.Pos(int(f.Pos()) + err.Pos.Offset),
+				Pos:     pass.Fset.File(f.Pos()).Pos(err.Pos.Offset),
 				Message: "unchecked error",
 			})
 		}

errcheck/analyzer_test.go

@@ -0,0 +1,12 @@
+package errcheck
+
+import (
+	"golang.org/x/tools/go/analysis/analysistest"
+	"path/filepath"
+	"testing"
+)
+
+func TestAnalyzer(t *testing.T) {
+	packageDir := filepath.Join(analysistest.TestData(), "src/a/")
+	_ = analysistest.Run(t, packageDir, Analyzer)
+}

errcheck/testdata/src/a/main.go

@@ -1,3 +1,5 @@
+// ensure that the package keyword is not equal to file beginning
+// to test correct position calculations.
 package a
 
 import (