Using simplest for of integration possible

Author: iwankgb

go.mod

@@ -74,5 +74,5 @@ require (
 )
 
 replace (
-	github.com/jgautheron/goconst => github.com/iwankgb/goconst v0.0.0-20201113193136-4c8fa7523232
+	github.com/jgautheron/goconst => github.com/iwankgb/goconst v0.0.0-20201115195935-66b9063f334d
 )

go.sum

@@ -53,8 +53,11 @@ func checkConstants(pass *analysis.Pass, lintCtx *linter.Context) ([]goanalysis.
 		ParseNumbers:       lintCtx.Settings().Goconst.ParseNumbers,
 		NumberMin:          lintCtx.Settings().Goconst.NumberMin,
 		NumberMax:          lintCtx.Settings().Goconst.NumberMax,
+		ExcludeTypes:       map[goconstAPI.Type]bool{},
+	}
+	if lintCtx.Settings().Goconst.IgnoreCalls {
+		cfg.ExcludeTypes[goconstAPI.Call] = true
 	}
-
 	goconstIssues, err := goconstAPI.Run(pass.Files, pass.Fset, &cfg)
 	if err != nil {
 		return nil, err
@@ -66,10 +69,7 @@ func checkConstants(pass *analysis.Pass, lintCtx *linter.Context) ([]goanalysis.
 
 	res := make([]goanalysis.Issue, 0, len(goconstIssues))
 	for _, i := range goconstIssues {
-		if lintCtx.Settings().Goconst.IgnoreCalls && i.Typ == goconstAPI.Call {
-			continue
-		}
-		textBegin := fmt.Sprintf("string %s has %d occurrences as %s statement", formatCode(i.Str, lintCtx.Cfg), i.OccurrencesCount, i.Typ)
+		textBegin := fmt.Sprintf("string %s has %d occurrences", formatCode(i.Str, lintCtx.Cfg), i.OccurrencesCount)
 		var textEnd string
 		if i.MatchingConst == "" {
 			textEnd = ", make it a constant"

pkg/golinters/goconst.go

@@ -4,7 +4,7 @@ package testdata
 import "fmt"
 
 func GoconstA() {
-	a := "needconst" // ERROR "string `needconst` has 5 occurrences as assignment statement, make it a constant"
+	a := "needconst" // ERROR "string `needconst` has 5 occurrences, make it a constant"
 	fmt.Print(a)
 	b := "needconst"
 	fmt.Print(b)
@@ -22,7 +22,7 @@ func GoconstB() {
 const AlreadyHasConst = "alreadyhasconst"
 
 func GoconstC() {
-	a := "alreadyhasconst" // ERROR "string `alreadyhasconst` has 3 occurrences as assignment statement, but such constant `AlreadyHasConst` already exists"
+	a := "alreadyhasconst" // ERROR "string `alreadyhasconst` has 3 occurrences, but such constant `AlreadyHasConst` already exists"
 	fmt.Print(a)
 	b := "alreadyhasconst"
 	fmt.Print(b)

test/testdata/goconst.go

@@ -7,11 +7,11 @@ import "fmt"
 const FooBar = "foobar"
 
 func Baz() {
-	a := "foobar" // ERROR "string `foobar` has 3 occurrences as assignment statement, but such constant `FooBar` already exists"
+	a := "foobar" // ERROR "string `foobar` has 4 occurrences, but such constant `FooBar` already exists"
 	fmt.Print(a)
 	b := "foobar"
 	fmt.Print(b)
 	c := "foobar"
 	fmt.Print(c)
-	fmt.Print("foobar") // ERROR "string `foobar` has 1 occurrences as call statement, but such constant `FooBar` already exists"
+	fmt.Print("foobar")
 }