Refactor

go.mod

@@ -2,6 +2,6 @@ module github.com/nametake/golangci-lint-langserver
 
 go 1.23.4
 
-require github.com/sourcegraph/jsonrpc2 v0.0.0-20191222043438-96c4efab7ee2
+require github.com/sourcegraph/jsonrpc2 v0.2.0
 
 require github.com/google/go-cmp v0.6.0

go.sum

@@ -2,5 +2,5 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/sourcegraph/jsonrpc2 v0.0.0-20191222043438-96c4efab7ee2 h1:5VGNYxMxzZ8Jb2bARgVl1DNg8vpcd9S8b4MbbjWQ8/w=
-github.com/sourcegraph/jsonrpc2 v0.0.0-20191222043438-96c4efab7ee2/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo=
+github.com/sourcegraph/jsonrpc2 v0.2.0 h1:KjN/dC4fP6aN9030MZCJs9WQbTOjWHhrtKVpzzSrr/U=
+github.com/sourcegraph/jsonrpc2 v0.2.0/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo=

golangci-lint.go

@@ -3,11 +3,11 @@ package main
 import "strings"
 
 type Issue struct {
-	FromLinter  string      `json:"FromLinter"`
-	Text        string      `json:"Text"`
-	Severity    string      `json:"Severity"`
-	SourceLines []string    `json:"SourceLines"`
-	Replacement interface{} `json:"Replacement"`
+	FromLinter  string   `json:"FromLinter"`
+	Text        string   `json:"Text"`
+	Severity    string   `json:"Severity"`
+	SourceLines []string `json:"SourceLines"`
+	Replacement any      `json:"Replacement"`
 	Pos         struct {
 		Filename string `json:"Filename"`
 		Offset   int    `json:"Offset"`
@@ -42,7 +42,6 @@ func (i Issue) DiagSeverity() DiagnosticSeverity {
 	}
 }
 
-//nolint:unused,deadcode
 type GolangCILintResult struct {
 	Issues []Issue `json:"Issues"`
 	Report struct {
@@ -51,5 +50,6 @@ type GolangCILintResult struct {
 			Enabled          bool   `json:"Enabled"`
 			EnabledByDefault bool   `json:"EnabledByDefault,omitempty"`
 		} `json:"Linters"`
+		Error string `json:"Error"`
 	} `json:"Report"`
 }

handler.go

@@ -56,15 +56,15 @@ func (h *langHandler) lint(uri DocumentURI) ([]Diagnostic, error) {
 	args := make([]string, 0, len(h.command))
 	args = append(args, h.command[1:]...)
 	args = append(args, dir)
-	//nolint:gosec
 	cmd := exec.Command(h.command[0], args...)
 	if strings.HasPrefix(path, h.rootDir) {
 		cmd.Dir = h.rootDir
 		file = path[len(h.rootDir)+1:]
 	} else {
 		cmd.Dir = dir
 	}
-	h.logger.DebugJSON("golangci-lint-langserver: golingci-lint cmd", cmd)
+
+	h.logger.DebugJSON("golangci-lint-langserver: golingci-lint cmd:", cmd.Args)
 
 	b, err := cmd.Output()
 	if err == nil {
@@ -134,7 +134,7 @@ func (h *langHandler) linter() {
 
 		diagnostics, err := h.lint(uri)
 		if err != nil {
-			h.logger.Printf("%s", err)
+			h.logger.Printf("%s\n", err)
 
 			continue
 		}
@@ -146,12 +146,12 @@ func (h *langHandler) linter() {
 				URI:         uri,
 				Diagnostics: diagnostics,
 			}); err != nil {
-			h.logger.Printf("%s", err)
+			h.logger.Printf("%s\n", err)
 		}
 	}
 }
 
-func (h *langHandler) handle(ctx context.Context, conn *jsonrpc2.Conn, req *jsonrpc2.Request) (result interface{}, err error) {
+func (h *langHandler) handle(ctx context.Context, conn *jsonrpc2.Conn, req *jsonrpc2.Request) (result any, err error) {
 	h.logger.DebugJSON("golangci-lint-langserver: request:", req)
 
 	switch req.Method {
@@ -176,7 +176,7 @@ func (h *langHandler) handle(ctx context.Context, conn *jsonrpc2.Conn, req *json
 	return nil, &jsonrpc2.Error{Code: jsonrpc2.CodeMethodNotFound, Message: fmt.Sprintf("method not supported: %s", req.Method)}
 }
 
-func (h *langHandler) handleInitialize(_ context.Context, conn *jsonrpc2.Conn, req *jsonrpc2.Request) (result interface{}, err error) {
+func (h *langHandler) handleInitialize(_ context.Context, conn *jsonrpc2.Conn, req *jsonrpc2.Request) (result any, err error) {
 	var params InitializeParams
 	if err := json.Unmarshal(*req.Params, &params); err != nil {
 		return nil, err
@@ -198,13 +198,13 @@ func (h *langHandler) handleInitialize(_ context.Context, conn *jsonrpc2.Conn, r
 	}, nil
 }
 
-func (h *langHandler) handleShutdown(_ context.Context, _ *jsonrpc2.Conn, _ *jsonrpc2.Request) (result interface{}, err error) {
+func (h *langHandler) handleShutdown(_ context.Context, _ *jsonrpc2.Conn, _ *jsonrpc2.Request) (result any, err error) {
 	close(h.request)
 
 	return nil, nil
 }
 
-func (h *langHandler) handleTextDocumentDidOpen(_ context.Context, _ *jsonrpc2.Conn, req *jsonrpc2.Request) (result interface{}, err error) {
+func (h *langHandler) handleTextDocumentDidOpen(_ context.Context, _ *jsonrpc2.Conn, req *jsonrpc2.Request) (result any, err error) {
 	var params DidOpenTextDocumentParams
 	if err := json.Unmarshal(*req.Params, &params); err != nil {
 		return nil, err
@@ -215,15 +215,15 @@ func (h *langHandler) handleTextDocumentDidOpen(_ context.Context, _ *jsonrpc2.C
 	return nil, nil
 }
 
-func (h *langHandler) handleTextDocumentDidClose(_ context.Context, _ *jsonrpc2.Conn, _ *jsonrpc2.Request) (result interface{}, err error) {
+func (h *langHandler) handleTextDocumentDidClose(_ context.Context, _ *jsonrpc2.Conn, _ *jsonrpc2.Request) (result any, err error) {
 	return nil, nil
 }
 
-func (h *langHandler) handleTextDocumentDidChange(_ context.Context, _ *jsonrpc2.Conn, _ *jsonrpc2.Request) (result interface{}, err error) {
+func (h *langHandler) handleTextDocumentDidChange(_ context.Context, _ *jsonrpc2.Conn, _ *jsonrpc2.Request) (result any, err error) {
 	return nil, nil
 }
 
-func (h *langHandler) handleTextDocumentDidSave(_ context.Context, _ *jsonrpc2.Conn, req *jsonrpc2.Request) (result interface{}, err error) {
+func (h *langHandler) handleTextDocumentDidSave(_ context.Context, _ *jsonrpc2.Conn, req *jsonrpc2.Request) (result any, err error) {
 	var params DidSaveTextDocumentParams
 	if err := json.Unmarshal(*req.Params, &params); err != nil {
 		return nil, err
@@ -234,6 +234,6 @@ func (h *langHandler) handleTextDocumentDidSave(_ context.Context, _ *jsonrpc2.C
 	return nil, nil
 }
 
-func (h *langHandler) handlerWorkspaceDidChangeConfiguration(_ context.Context, _ *jsonrpc2.Conn, req *jsonrpc2.Request) (result interface{}, err error) {
+func (h *langHandler) handlerWorkspaceDidChangeConfiguration(_ context.Context, _ *jsonrpc2.Conn, _ *jsonrpc2.Request) (result any, err error) {
 	return nil, nil
 }

handler_test.go

@@ -166,6 +166,79 @@ func TestLangHandler_lint_Integration(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "monorepo with multiple go.mod and .golangci.yaml files (foo module)",
+			h: &langHandler{
+				logger:  newStdLogger(false),
+				command: command,
+				rootDir: filepath.Dir("./testdata/monorepo"),
+			},
+			filePath: "./testdata/monorepo/foo/main.go",
+			want: []Diagnostic{
+				{
+					Range: Range{
+						Start: Position{
+							Line:      8,
+							Character: 0,
+						},
+						End: Position{
+							Line:      8,
+							Character: 0,
+						},
+					},
+					Severity:           DSWarning,
+					Code:               nil,
+					Source:             pt("wsl"),
+					Message:            "wsl: block should not end with a whitespace (or comment)",
+					RelatedInformation: nil,
+				},
+			},
+		},
+		{
+			name: "monorepo with multiple go.mod and .golangci.yaml files (bar module)",
+			h: &langHandler{
+				logger:  newStdLogger(false),
+				command: command,
+				rootDir: filepath.Dir("./testdata/monorepo"),
+			},
+			filePath: "./testdata/monorepo/bar/main.go",
+			want: []Diagnostic{
+				{
+					Range: Range{
+						Start: Position{
+							Line:      3,
+							Character: 4,
+						},
+						End: Position{
+							Line:      3,
+							Character: 4,
+						},
+					},
+					Severity:           DSWarning,
+					Code:               nil,
+					Source:             pt("unused"),
+					Message:            "unused: var foo is unused",
+					RelatedInformation: nil,
+				},
+				{
+					Range: Range{
+						Start: Position{
+							Line:      8,
+							Character: 0,
+						},
+						End: Position{
+							Line:      8,
+							Character: 0,
+						},
+					},
+					Severity:           DSWarning,
+					Code:               nil,
+					Source:             pt("wsl"),
+					Message:            "wsl: block should not end with a whitespace (or comment)",
+					RelatedInformation: nil,
+				},
+			},
+		},
 	}
 
 	for _, tt := range tests {

logger.go

@@ -3,14 +3,13 @@ package main
 import (
 	"encoding/json"
 	"log"
-	"os"
 )
 
 var _ logger = (*stdLogger)(nil)
 
 type logger interface {
-	Printf(format string, args ...interface{})
-	DebugJSON(label string, arg interface{})
+	Printf(format string, args ...any)
+	DebugJSON(label string, arg any)
 }
 
 type stdLogger struct {
@@ -21,22 +20,23 @@ type stdLogger struct {
 func newStdLogger(debug bool) *stdLogger {
 	return &stdLogger{
 		debug:  debug,
-		stderr: log.New(os.Stderr, "", 0),
+		stderr: log.New(log.Writer(), "", log.LstdFlags),
 	}
 }
 
-func (l *stdLogger) Printf(format string, args ...interface{}) {
+func (l *stdLogger) Printf(format string, args ...any) {
 	l.stderr.Printf(format, args...)
 }
 
-func (l *stdLogger) DebugJSON(label string, arg interface{}) {
+func (l *stdLogger) DebugJSON(label string, arg any) {
 	if !l.debug {
 		return
 	}
 
 	b, err := json.Marshal(arg)
 	if err != nil {
 		l.stderr.Println(err)
+		return
 	}
 
 	l.stderr.Println(label, string(b))

lsp.go

@@ -17,7 +17,6 @@ type InitializeResult struct {
 
 type TextDocumentSyncKind int
 
-//nolint:unused,deadcode
 const (
 	TDSKNone TextDocumentSyncKind = iota
 	TDSKFull
@@ -89,7 +88,6 @@ type DiagnosticRelatedInformation struct {
 
 type DiagnosticSeverity int
 
-//nolint:unused,deadcode
 const (
 	DSError DiagnosticSeverity = iota + 1
 	DSWarning

testdata/monorepo/bar/.golangci.yaml

@@ -0,0 +1,5 @@
+version: "2"
+linters:
+  enable:
+    - unused
+    - wsl

testdata/monorepo/bar/go.mod

@@ -0,0 +1,3 @@
+module foo
+
+go 1.22.10

testdata/monorepo/bar/main.go

@@ -0,0 +1,9 @@
+package main
+
+var bar = "bar"
+var foo = "foo"
+
+func Bar() {
+	_ = bar
+
+}

testdata/monorepo/foo/.golangci.yaml

@@ -0,0 +1,6 @@
+version: "2"
+linters:
+  enable:
+    - wsl
+  disable:
+    - unused

testdata/monorepo/foo/go.mod

@@ -0,0 +1,3 @@
+module foo
+
+go 1.22.10

testdata/monorepo/foo/main.go

@@ -0,0 +1,9 @@
+package main
+
+var bar = "bar"
+var foo = "foo"
+
+func Bar() {
+	_ = bar
+
+}

uri.go

@@ -27,7 +27,6 @@ func uriToPath(uri string) string {
 }
 
 func isWindowsDriveURIPath(uri string) bool {
-	//nolint:gomnd
 	if len(uri) < 4 {
 		return false
 	}