diff --git a/pkg/analyzer/internal/mapping/mapping.go b/pkg/analyzer/internal/mapping/mapping.go index dbb6415..506166b 100644 --- a/pkg/analyzer/internal/mapping/mapping.go +++ b/pkg/analyzer/internal/mapping/mapping.go @@ -197,8 +197,8 @@ var TLSSignatureScheme = map[string]string{ var ConstantKind = map[string]string{ // constant.Unknown.String(): "constant.Unknown.String()", constant.Bool.String(): "constant.Bool.String()", - constant.String.String(): "constant..String()", - constant.Int.String(): "constant..String()", - constant.Float.String(): "constant..String()", - constant.Complex.String(): "constant..String()", + constant.String.String(): "constant.String.String()", + constant.Int.String(): "constant.Int.String()", + constant.Float.String(): "constant.Float.String()", + constant.Complex.String(): "constant.Complex.String()", } diff --git a/pkg/analyzer/testdata/src/a/constant/kind.go b/pkg/analyzer/testdata/src/a/constant/kind.go index 31b8980..88da188 100755 --- a/pkg/analyzer/testdata/src/a/constant/kind.go +++ b/pkg/analyzer/testdata/src/a/constant/kind.go @@ -6,34 +6,34 @@ import "fmt" var ( _ = "Bool" // want `"Bool" can be replaced by constant\.Bool\.String\(\)` - _ = "Complex" // want `"Complex" can be replaced by constant\.\.String\(\)` - _ = "Float" // want `"Float" can be replaced by constant\.\.String\(\)` - _ = "Int" // want `"Int" can be replaced by constant\.\.String\(\)` - _ = "String" // want `"String" can be replaced by constant\.\.String\(\)` + _ = "Complex" // want `"Complex" can be replaced by constant\.Complex\.String\(\)` + _ = "Float" // want `"Float" can be replaced by constant\.Float\.String\(\)` + _ = "Int" // want `"Int" can be replaced by constant\.Int\.String\(\)` + _ = "String" // want `"String" can be replaced by constant\.String\.String\(\)` ) const ( _ = "Bool" // want `"Bool" can be replaced by constant\.Bool\.String\(\)` - _ = "Complex" // want `"Complex" can be replaced by constant\.\.String\(\)` - _ = "Float" // want `"Float" can be replaced by constant\.\.String\(\)` - _ = "Int" // want `"Int" can be replaced by constant\.\.String\(\)` - _ = "String" // want `"String" can be replaced by constant\.\.String\(\)` + _ = "Complex" // want `"Complex" can be replaced by constant\.Complex\.String\(\)` + _ = "Float" // want `"Float" can be replaced by constant\.Float\.String\(\)` + _ = "Int" // want `"Int" can be replaced by constant\.Int\.String\(\)` + _ = "String" // want `"String" can be replaced by constant\.String\.String\(\)` ) func _() { _ = func(s string) string { return s }("Bool") // want `"Bool" can be replaced by constant\.Bool\.String\(\)` _ = func(s string) string { return s }("text before key Bool") _ = func(s string) string { return s }("Bool text after key") - _ = func(s string) string { return s }("Complex") // want `"Complex" can be replaced by constant\.\.String\(\)` + _ = func(s string) string { return s }("Complex") // want `"Complex" can be replaced by constant\.Complex\.String\(\)` _ = func(s string) string { return s }("text before key Complex") _ = func(s string) string { return s }("Complex text after key") - _ = func(s string) string { return s }("Float") // want `"Float" can be replaced by constant\.\.String\(\)` + _ = func(s string) string { return s }("Float") // want `"Float" can be replaced by constant\.Float\.String\(\)` _ = func(s string) string { return s }("text before key Float") _ = func(s string) string { return s }("Float text after key") - _ = func(s string) string { return s }("Int") // want `"Int" can be replaced by constant\.\.String\(\)` + _ = func(s string) string { return s }("Int") // want `"Int" can be replaced by constant\.Int\.String\(\)` _ = func(s string) string { return s }("text before key Int") _ = func(s string) string { return s }("Int text after key") - _ = func(s string) string { return s }("String") // want `"String" can be replaced by constant\.\.String\(\)` + _ = func(s string) string { return s }("String") // want `"String" can be replaced by constant\.String\.String\(\)` _ = func(s string) string { return s }("text before key String") _ = func(s string) string { return s }("String text after key") } @@ -42,16 +42,16 @@ func _() { _ = fmt.Sprint("Bool") // want `"Bool" can be replaced by constant\.Bool\.String\(\)` _ = fmt.Sprint("text before key Bool") _ = fmt.Sprint("Bool text after key") - _ = fmt.Sprint("Complex") // want `"Complex" can be replaced by constant\.\.String\(\)` + _ = fmt.Sprint("Complex") // want `"Complex" can be replaced by constant\.Complex\.String\(\)` _ = fmt.Sprint("text before key Complex") _ = fmt.Sprint("Complex text after key") - _ = fmt.Sprint("Float") // want `"Float" can be replaced by constant\.\.String\(\)` + _ = fmt.Sprint("Float") // want `"Float" can be replaced by constant\.Float\.String\(\)` _ = fmt.Sprint("text before key Float") _ = fmt.Sprint("Float text after key") - _ = fmt.Sprint("Int") // want `"Int" can be replaced by constant\.\.String\(\)` + _ = fmt.Sprint("Int") // want `"Int" can be replaced by constant\.Int\.String\(\)` _ = fmt.Sprint("text before key Int") _ = fmt.Sprint("Int text after key") - _ = fmt.Sprint("String") // want `"String" can be replaced by constant\.\.String\(\)` + _ = fmt.Sprint("String") // want `"String" can be replaced by constant\.String\.String\(\)` _ = fmt.Sprint("text before key String") _ = fmt.Sprint("String text after key") }