commit 61c0d375276aca115057aa6f1c53026a5440195d
author Koichi Shiraishi <zchee.io@gmail.com> Mon Apr 22 18:59:53 2019 +0900
committer Rebecca Stambler <rstambler@golang.org> Mon Apr 22 18:44:13 2019 +0000
tree 81218680cc54b3fea8a6636388ec598ebc592e1e
parent 15d5d381ff62ba91f005c11eca1cf6c5dff66eec

internal/lsp: fix typo on 'textDocument/foldingRange' method

LSP specification define 'foldingRange', not 'foldingRanges'.
Just trims end of 's' and rename interface method name.

ref: https://github.com/Microsoft/language-server-protocol/blob/gh-pages/specification.md#folding-range-request-leftwards_arrow_with_hook

Change-Id: Ie2a91f6c0bdd99b8ae9000ba87c24118b264b934
Reviewed-on: https://go-review.googlesource.com/c/tools/+/173079
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

internal/lsp/protocol/server.go

diff --git a/internal/lsp/protocol/server.go b/internal/lsp/protocol/server.go
index 6eb7747..d2cbb66 100644
--- a/internal/lsp/protocol/server.go
+++ b/internal/lsp/protocol/server.go
@@ -49,7 +49,7 @@
 	RangeFormatting(context.Context, *DocumentRangeFormattingParams) ([]TextEdit, error)
 	OnTypeFormatting(context.Context, *DocumentOnTypeFormattingParams) ([]TextEdit, error)
 	Rename(context.Context, *RenameParams) ([]WorkspaceEdit, error)
-	FoldingRanges(context.Context, *FoldingRangeParams) ([]FoldingRange, error)
+	FoldingRange(context.Context, *FoldingRangeParams) ([]FoldingRange, error)
 }
 
 func serverHandler(log xlog.Logger, server Server) jsonrpc2.Handler {
@@ -454,7 +454,7 @@
 				sendParseError(ctx, log, conn, r, err)
 				return
 			}
-			resp, err := server.FoldingRanges(ctx, &params)
+			resp, err := server.FoldingRange(ctx, &params)
 			if err := conn.Reply(ctx, r, resp, err); err != nil {
 				log.Errorf(ctx, "%v", err)
 			}
@@ -714,9 +714,9 @@
 	return result, nil
 }
 
-func (s *serverDispatcher) FoldingRanges(ctx context.Context, params *FoldingRangeParams) ([]FoldingRange, error) {
+func (s *serverDispatcher) FoldingRange(ctx context.Context, params *FoldingRangeParams) ([]FoldingRange, error) {
 	var result []FoldingRange
-	if err := s.Conn.Call(ctx, "textDocument/foldingRanges", params, &result); err != nil {
+	if err := s.Conn.Call(ctx, "textDocument/foldingRange", params, &result); err != nil {
 		return nil, err
 	}
 	return result, nil

internal/lsp/server.go

diff --git a/internal/lsp/server.go b/internal/lsp/server.go
index bd466e1..1f2d37b 100644
--- a/internal/lsp/server.go
+++ b/internal/lsp/server.go
@@ -242,8 +242,8 @@
 	return nil, notImplemented("Rename")
 }
 
-func (s *Server) FoldingRanges(context.Context, *protocol.FoldingRangeParams) ([]protocol.FoldingRange, error) {
-	return nil, notImplemented("FoldingRanges")
+func (s *Server) FoldingRange(context.Context, *protocol.FoldingRangeParams) ([]protocol.FoldingRange, error) {
+	return nil, notImplemented("FoldingRange")
 }
 
 func notImplemented(method string) *jsonrpc2.Error {