fix some golint issues

vim-jp · Jan 8, 2017 · 3351ff2 · 3351ff2
1 parent d320a46
commit 3351ff2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/langserver/handle_text_document_did_open.go b/langserver/handle_text_document_did_open.go
@@ -17,11 +17,10 @@ func (h *LangHandler) handleTextDocumentDidOpen(ctx context.Context, conn *jsonr
 		return nil, err
 	}
 
-	f, err := NewVimFile(params.TextDocument)
+	f, err := newVimFile(params.TextDocument)
 	if err != nil {
 		return nil, err
-	} else {
-		h.files[params.TextDocument.URI] = f
-		return nil, nil
 	}
+	h.files[params.TextDocument.URI] = f
+	return nil, nil
 }
diff --git a/langserver/handle_text_document_symbol.go b/langserver/handle_text_document_symbol.go
@@ -3,7 +3,6 @@ package langserver
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	"github.com/haya14busa/go-vimlparser/ast"
@@ -25,13 +24,10 @@ func (h *LangHandler) handleTextDocumentSymbols(ctx context.Context, conn *jsonr
 		node, err := f.GetAst()
 		if err != nil {
 			return nil, err
-		} else {
-			return getDocumentSymbols(params, node), nil
 		}
-		return nil, nil
-	} else {
-		return nil, errors.New(fmt.Sprintf("% not open", params.TextDocument.URI))
+		return getDocumentSymbols(params, node), nil
 	}
+	return nil, fmt.Errorf("% not open", params.TextDocument.URI)
 }
 
 func getDocumentSymbols(params DocumentSymbolParams, node ast.Node) []SymbolInformation {

diff --git a/langserver/handler.go b/langserver/handler.go
@@ -28,7 +28,7 @@ type vimfile struct {
 	AstError error
 }
 
-func NewVimFile(textDocumentItem TextDocumentItem) (result *vimfile, error error) {
+func newVimFile(textDocumentItem TextDocumentItem) (result *vimfile, error error) {
 	return &vimfile{
 		TextDocumentItem: textDocumentItem,
 		Ast:              nil,

diff --git a/langserver/lsp.go b/langserver/lsp.go
@@ -4,7 +4,7 @@ type InitializeParams struct {
 	ProcessID             int                `json:"processId,omitempty"`
 	RootPath              string             `json:"rootPath,omitempty"`
 	InitializationOptions InitializeOptions  `json:"initializationOptions,omitempty"`
-	Capabilities          ClientCapabilities `json:"capabilities",omitempty`
+	Capabilities          ClientCapabilities `json:"capabilities,omitempty"`
 	Trace                 string             `json:"trace,omitempty"`
 }
 
@@ -33,7 +33,7 @@ type ServerCapabilities struct {
 
 type TextDocumentItem struct {
 	URI        string `json:"uri"`
-	LanguageId string `json:"languageId"`
+	LanguageID string `json:"languageId"`
 	Version    int    `json:"version"`
 	Text       string `json:"text"`
 }