gopls/internal/protocol/generate: remove manual rename overwritten For golang/go#80200 Change-Id: I49c68af0b82a0a580665e831574d68a7cdadc04a Reviewed-on: https://go-review.googlesource.com/c/tools/+/796600 Reviewed-by: Alan Donovan <adonovan@google.com> LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/gopls/internal/protocol/generate/main.go b/gopls/internal/protocol/generate/main.go index 4c3a597..4b8f53d 100644 --- a/gopls/internal/protocol/generate/main.go +++ b/gopls/internal/protocol/generate/main.go
@@ -20,7 +20,6 @@ "os" "os/exec" "path/filepath" - "slices" "strings" ) @@ -79,28 +78,6 @@ model := parse(filepath.Join(*repodir, "protocol/metaModel.json")) - // Although the LSP specification defines RenameParams as extending - // TextDocumentPositionParams, the metaModel.json definition flattens - // these properties (likely due to specific comments in the TS definition). - // See microsoft/vscode-languageserver-node#1698. - // - // TODO(hxjiang): delete the patch logic after releasing lsp 3.18. - for _, s := range model.Structures { - if s.Name == "RenameParams" { - s.Properties = slices.DeleteFunc(s.Properties, func(t NameType) bool { - return t.Name == "position" || t.Name == "textDocument" - }) - if !slices.ContainsFunc(s.Extends, func(t *Type) bool { - return t.Kind == "reference" && t.Name == "TextDocumentPositionParams" - }) { - s.Extends = append(s.Extends, &Type{ - Kind: "reference", - Name: "TextDocumentPositionParams", - }) - } - } - } - // Add a client to server LSP method "command/resolve" for interactive // refactoring. The method's param and result are both "ExecuteCommandParams". // The types are only accessible from the "workspace/executeCommand" request.