From 1f7e43a46c9f7cd30a57fdc60ee0af464eaca2fd Mon Sep 17 00:00:00 2001 From: Thomas Bruyelle Date: Thu, 27 Jun 2024 17:01:28 +0200 Subject: [PATCH] fix linter --- cmd/gnols/main_test.go | 2 +- internal/gno/parser.go | 8 +++----- internal/gno/parser_test.go | 6 +++--- internal/handler/completion.go | 1 - 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cmd/gnols/main_test.go b/cmd/gnols/main_test.go index 3be1f2f..665700b 100644 --- a/cmd/gnols/main_test.go +++ b/cmd/gnols/main_test.go @@ -131,7 +131,7 @@ func call(ts *testscript.TestScript, method string, paramFile string) { ) _, err := conn.Call(context.Background(), method, params, &response) if err != nil { - if jerr, ok := err.(*jsonrpc2.Error); ok { + if jerr, ok := err.(*jsonrpc2.Error); ok { //nolint:errorlint // output jsonrpc2.Error in json response = map[string]any{"error": jerr} } else { diff --git a/internal/gno/parser.go b/internal/gno/parser.go index ceeba35..22e92a7 100644 --- a/internal/gno/parser.go +++ b/internal/gno/parser.go @@ -41,7 +41,7 @@ func ParsePackage(dir, importPath string) (*Package, error) { } if len(symbols) == 0 { // Ignore directories w/o symbols - return nil, nil + return nil, nil //nolint:nilnil } return &Package{ @@ -119,10 +119,8 @@ func getSymbols(dir string, filename string) ([]Symbol, error) { fset := token.NewFileSet() // Parse the file and create an AST. - file, err := parser.ParseFile(fset, filename, nil, parser.ParseComments) - if err != nil { - // fmt.Println("PARSEFILE", err) - } + file, _ := parser.ParseFile(fset, filename, nil, parser.ParseComments) + // fmt.Println("PARSEFILE", err) bsrc, err := os.ReadFile(filename) if err != nil { diff --git a/internal/gno/parser_test.go b/internal/gno/parser_test.go index ba522d8..b29b100 100644 --- a/internal/gno/parser_test.go +++ b/internal/gno/parser_test.go @@ -12,14 +12,14 @@ func TestParsePackage(t *testing.T) { testscript.Run(t, testscript.Params{ Dir: "testdata", Cmds: map[string]func(*testscript.TestScript, bool, []string){ - "printSymbols": func(ts *testscript.TestScript, _ bool, arg []string) { + "printSymbols": func(ts *testscript.TestScript, neg bool, arg []string) { //nolint:unparam pkg, err := gno.ParsePackage(ts.Getenv("WORK"), "") if err != nil { ts.Fatalf("gno.ParsePackage: %v", err) } bz, _ := json.MarshalIndent(pkg.Symbols, "", " ") - ts.Stdout().Write(bz) - ts.Stdout().Write([]byte{'\n'}) + ts.Stdout().Write(bz) //nolint:errcheck + ts.Stdout().Write([]byte{'\n'}) //nolint:errcheck }, }, }) diff --git a/internal/handler/completion.go b/internal/handler/completion.go index 194ad8e..f493f45 100644 --- a/internal/handler/completion.go +++ b/internal/handler/completion.go @@ -86,7 +86,6 @@ func (h handler) lookupSymbols(name string, selectors []string) []gno.Symbol { func lookupSymbols(symbols []gno.Symbol, name string, selectors []string) []gno.Symbol { for _, sym := range symbols { switch { - case sym.Name == name: slog.Info("found symbol", "name", name, "kind", sym.Kind, "selectors", selectors) // we found a symbol matching name