From 494e18b268547195c59a3e1b6c1b0f58385aff86 Mon Sep 17 00:00:00 2001 From: Suzy Mueller Date: Thu, 20 Jun 2019 11:29:44 -0400 Subject: [PATCH] internal/lsp: send client expected rename provider This change sends the expected boolean value for 'renameProvider' to the client. When a client does not send 'prepareSupport' in its initial 'initialize' request, the client expects to get a boolean value for 'renameProvider'. Since we do not yet provide prepare support, we just set 'renameProvider' to true regardless of the value of prepareSupport. Fixes golang/go#32703 Change-Id: I1103e51e1a2927b98aaedf2839996e9cd7f7cbcc Reviewed-on: https://go-review.googlesource.com/c/tools/+/183259 Reviewed-by: Rebecca Stambler Run-TryBot: Rebecca Stambler --- internal/lsp/general.go | 4 +--- internal/lsp/protocol/tsprotocol.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/lsp/general.go b/internal/lsp/general.go index cba3e209..683e537e 100644 --- a/internal/lsp/general.go +++ b/internal/lsp/general.go @@ -70,9 +70,7 @@ func (s *Server) initialize(ctx context.Context, params *protocol.InitializePara DocumentHighlightProvider: true, DocumentLinkProvider: &protocol.DocumentLinkOptions{}, ReferencesProvider: true, - RenameProvider: &protocol.RenameOptions{ - PrepareProvider: false, - }, + RenameProvider: true, SignatureHelpProvider: &protocol.SignatureHelpOptions{ TriggerCharacters: []string{"(", ","}, }, diff --git a/internal/lsp/protocol/tsprotocol.go b/internal/lsp/protocol/tsprotocol.go index e7d9f72d..830170e3 100644 --- a/internal/lsp/protocol/tsprotocol.go +++ b/internal/lsp/protocol/tsprotocol.go @@ -1533,7 +1533,7 @@ type ServerCapabilities struct { * specified if the client states that it supports * `prepareSupport` in its initial `initialize` request. */ - RenameProvider *RenameOptions `json:"renameProvider,omitempty"` // boolean | RenameOptions + RenameProvider interface{} `json:"renameProvider,omitempty"` // boolean | RenameOptions /*DocumentLinkProvider defined: * The server provides document link support.