From eeba61330c536f2c4a64412047b5b298b4d940ff Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Fri, 26 Jul 2024 09:42:36 +0300 Subject: [PATCH] dev: fix typos (#99) --- analyzer/analyzer.go | 6 +++--- analyzer/analyzer_test.go | 10 +++++----- analyzer/internal/config/allow.go | 2 +- analyzer/internal/config/reject.go | 2 +- analyzer/std_test.go | 2 +- .../{anonymous_interafce.go => anonymous_interface.go} | 2 +- analyzer/testdata/named_interfaces_simple.go | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) rename analyzer/testdata/{anonymous_interafce.go => anonymous_interface.go} (76%) diff --git a/analyzer/analyzer.go b/analyzer/analyzer.go index f68170f..1b452f3 100644 --- a/analyzer/analyzer.go +++ b/analyzer/analyzer.go @@ -27,7 +27,7 @@ type analyzer struct { mu sync.RWMutex handler validator err error - diabledNolint bool + disabledNolint bool found []analysis.Diagnostic } @@ -63,7 +63,7 @@ func (a *analyzer) run(pass *analysis.Pass) (interface{}, error) { } // 003. Is it allowed to be checked? - if !a.diabledNolint && hasDisallowDirective(f.Doc) { + if !a.disabledNolint && hasDisallowDirective(f.Doc) { return } @@ -115,7 +115,7 @@ func (a *analyzer) readConfiguration(fs *flag.FlagSet) { // First: checking nonolint directive val := fs.Lookup("nonolint") if val != nil { - a.diabledNolint = fs.Lookup("nonolint").Value.String() == "true" + a.disabledNolint = fs.Lookup("nonolint").Value.String() == "true" } // Second: validators implementation next diff --git a/analyzer/analyzer_test.go b/analyzer/analyzer_test.go index 2cb0868..8da7eaf 100644 --- a/analyzer/analyzer_test.go +++ b/analyzer/analyzer_test.go @@ -71,7 +71,7 @@ func TestAll(t *testing.T) { tests = append(tests, testCase{ name: "anonymous Interface/allow", - mask: []string{"anonymous_interafce.go", "go.*"}, + mask: []string{"anonymous_interface.go", "go.*"}, meta: map[string]string{ "allow": types.NameAnon, }, @@ -80,12 +80,12 @@ func TestAll(t *testing.T) { tests = append(tests, testCase{ name: "anonymous Interface/reject", - mask: []string{"anonymous_interafce.go", "go.*"}, + mask: []string{"anonymous_interface.go", "go.*"}, meta: map[string]string{ "reject": types.NameAnon, }, want: []string{ - "NewanonymousInterface returns interface (anonymous interface)", + "NewAnonymousInterface returns interface (anonymous interface)", }, }) @@ -278,7 +278,7 @@ func TestAll(t *testing.T) { "allow": types.NameStdLib, // allow only interfaces from standard library (e.g. io.Writer, fmt.Stringer) }, want: []string{ - "NewanonymousInterface returns interface (anonymous interface)", + "NewAnonymousInterface returns interface (anonymous interface)", "dissAllowDirective2 returns interface (interface{})", "dissAllowDirective6 returns interface (interface{})", "fooInterface returns interface (interface{})", @@ -333,7 +333,7 @@ func TestAll(t *testing.T) { "allow": types.NameGeneric, // allow only generic interfaces }, want: []string{ - "NewanonymousInterface returns interface (anonymous interface)", + "NewAnonymousInterface returns interface (anonymous interface)", "dissAllowDirective2 returns interface (interface{})", "dissAllowDirective6 returns interface (interface{})", "fooInterface returns interface (interface{})", diff --git a/analyzer/internal/config/allow.go b/analyzer/internal/config/allow.go index 6a294ca..da101c7 100644 --- a/analyzer/internal/config/allow.go +++ b/analyzer/internal/config/allow.go @@ -2,7 +2,7 @@ package config import "github.com/butuzov/ireturn/analyzer/internal/types" -// allowConfig specifies a list of interfaces (keywords, patters and regular expressions) +// allowConfig specifies a list of interfaces (keywords, patterns and regular expressions) // that are allowed by ireturn as valid to return, any non listed interface are rejected. type allowConfig struct { *defaultConfig diff --git a/analyzer/internal/config/reject.go b/analyzer/internal/config/reject.go index bef6913..b2cde91 100644 --- a/analyzer/internal/config/reject.go +++ b/analyzer/internal/config/reject.go @@ -2,7 +2,7 @@ package config import "github.com/butuzov/ireturn/analyzer/internal/types" -// rejectConfig specifies a list of interfaces (keywords, patters and regular expressions) +// rejectConfig specifies a list of interfaces (keywords, patterns and regular expressions) // that are rejected by ireturn as valid to return, any non listed interface are allowed. type rejectConfig struct { *defaultConfig diff --git a/analyzer/std_test.go b/analyzer/std_test.go index b31f189..c36e920 100644 --- a/analyzer/std_test.go +++ b/analyzer/std_test.go @@ -19,7 +19,7 @@ func Test_isStdLib(t *testing.T) { t.Run(name, func(t *testing.T) { got := isStdPkgInterface(name) assert.Equal(t, got, want, - "pkg %s doens't match expectations (got %v vs want %v)", name, got, want) + "pkg %s doesn't match expectations (got %v vs want %v)", name, got, want) }) } } diff --git a/analyzer/testdata/anonymous_interafce.go b/analyzer/testdata/anonymous_interface.go similarity index 76% rename from analyzer/testdata/anonymous_interafce.go rename to analyzer/testdata/anonymous_interface.go index d81c8ac..a60608d 100644 --- a/analyzer/testdata/anonymous_interafce.go +++ b/analyzer/testdata/anonymous_interface.go @@ -4,7 +4,7 @@ type _t_anon_interface int func (t *_t_anon_interface) Do() {} -func NewanonymousInterface() interface { +func NewAnonymousInterface() interface { Do() } { t := _t_anon_interface(1) diff --git a/analyzer/testdata/named_interfaces_simple.go b/analyzer/testdata/named_interfaces_simple.go index 8f80dcb..6bd9840 100644 --- a/analyzer/testdata/named_interfaces_simple.go +++ b/analyzer/testdata/named_interfaces_simple.go @@ -3,15 +3,15 @@ package example type ( iDoer interface{} iDoerAny any - iDoerConcreat int + iDoerSpecific int ) func newIDoer() iDoer { - return iDoerConcreat(0) + return iDoerSpecific(0) } func newIDoerAny() iDoerAny { - return iDoerConcreat(0) + return iDoerSpecific(0) } type Fooer interface {