Merge pull request #12 from nametake/show-linter-name

Show linter name

Author: nametake

README.md

@@ -11,6 +11,15 @@ golangci-lint-langserver is [golangci-lint](https://github.com/golangci/golangci
 go get github.com/nametake/golangci-lint-langserver
 ```
 
+## Options
+
+```console
+  -debug
+        output debug log
+  -nolintername
+        don't show a linter name in message
+```
+
 ## Configuration
 
 You need to set golangci-lint command to initializationOptions with `--out-format json`.

golangci-lint.go

@@ -1,23 +1,25 @@
 package main
 
+type Issue struct {
+	FromLinter  string      `json:"FromLinter"`
+	Text        string      `json:"Text"`
+	SourceLines []string    `json:"SourceLines"`
+	Replacement interface{} `json:"Replacement"`
+	Pos         struct {
+		Filename string `json:"Filename"`
+		Offset   int    `json:"Offset"`
+		Line     int    `json:"Line"`
+		Column   int    `json:"Column"`
+	} `json:"Pos"`
+	LineRange struct {
+		From int `json:"From"`
+		To   int `json:"To"`
+	} `json:"LineRange,omitempty"`
+}
+
 //nolint:unused,deadcode
 type GolangCILintResult struct {
-	Issues []struct {
-		FromLinter  string      `json:"FromLinter"`
-		Text        string      `json:"Text"`
-		SourceLines []string    `json:"SourceLines"`
-		Replacement interface{} `json:"Replacement"`
-		Pos         struct {
-			Filename string `json:"Filename"`
-			Offset   int    `json:"Offset"`
-			Line     int    `json:"Line"`
-			Column   int    `json:"Column"`
-		} `json:"Pos"`
-		LineRange struct {
-			From int `json:"From"`
-			To   int `json:"To"`
-		} `json:"LineRange,omitempty"`
-	} `json:"Issues"`
+	Issues []Issue `json:"Issues"`
 	Report struct {
 		Linters []struct {
 			Name             string `json:"Name"`

handler.go

@@ -10,21 +10,23 @@ import (
 	"github.com/sourcegraph/jsonrpc2"
 )
 
-func NewHandler(logger logger) jsonrpc2.Handler {
+func NewHandler(logger logger, noLinterName bool) jsonrpc2.Handler {
 	handler := &langHandler{
-		logger:  logger,
-		request: make(chan DocumentURI),
+		logger:       logger,
+		request:      make(chan DocumentURI),
+		noLinterName: noLinterName,
 	}
 	go handler.linter()
 
 	return jsonrpc2.HandlerWithError(handler.handle)
 }
 
 type langHandler struct {
-	logger  logger
-	conn    *jsonrpc2.Conn
-	request chan DocumentURI
-	command []string
+	logger       logger
+	conn         *jsonrpc2.Conn
+	request      chan DocumentURI
+	command      []string
+	noLinterName bool
 
 	rootURI string
 }
@@ -66,14 +68,22 @@ func (h *langHandler) lint(uri DocumentURI) ([]Diagnostic, error) {
 			},
 			Severity: DSWarning,
 			Source:   &issue.FromLinter,
-			Message:  issue.Text,
+			Message:  h.diagnosticMessage(&issue),
 		}
 		diagnostics = append(diagnostics, d)
 	}
 
 	return diagnostics, nil
 }
 
+func (h *langHandler) diagnosticMessage(issue *Issue) string {
+	if h.noLinterName {
+		return issue.Text
+	}
+
+	return fmt.Sprintf("%s: %s", issue.FromLinter, issue.Text)
+}
+
 func (h *langHandler) linter() {
 	for {
 		uri, ok := <-h.request

main.go

@@ -9,13 +9,14 @@ import (
 )
 
 func main() {
-	debug := flag.Bool("debug", false, "show debug log")
+	debug := flag.Bool("debug", false, "output debug log")
+	noLinterName := flag.Bool("nolintername", false, "don't show a linter name in message")
 
 	flag.Parse()
 
 	logger := newStdLogger(*debug)
 
-	handler := NewHandler(logger)
+	handler := NewHandler(logger, *noLinterName)
 
 	var connOpt []jsonrpc2.ConnOpt