From d229a6140f31dcdd8d9b18d5ccdb17c5e3fc102d Mon Sep 17 00:00:00 2001 From: Rebecca Stambler Date: Fri, 1 Nov 2019 15:13:31 -0400 Subject: [PATCH] internal/lsp/cmd: re-enable the definition cmd tests A lot has changed since golang/go#32794 was filed, and we now have many more tests for the command line. Fixes golang/go#32794 Change-Id: Ib268865a2345fd6676b2679bd76197c2d8658a85 Reviewed-on: https://go-review.googlesource.com/c/tools/+/204818 Run-TryBot: Rebecca Stambler TryBot-Result: Gobot Gobot Reviewed-by: Ian Cottrell --- internal/lsp/cmd/test/definition.go | 4 ---- internal/lsp/testdata/godef/b/b.go.golden | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/lsp/cmd/test/definition.go b/internal/lsp/cmd/test/definition.go index e91b51193b..40da50be61 100644 --- a/internal/lsp/cmd/test/definition.go +++ b/internal/lsp/cmd/test/definition.go @@ -34,10 +34,6 @@ var godefModes = []godefMode{ } func (r *runner) Definition(t *testing.T, spn span.Span, d tests.Definition) { - // TODO: https://golang.org/issue/32794. - if !*tests.UpdateGolden { - t.Skip() - } if d.IsType || d.OnlyHover { // TODO: support type definition, hover queries return diff --git a/internal/lsp/testdata/godef/b/b.go.golden b/internal/lsp/testdata/godef/b/b.go.golden index f668f5f13a..e3ba2bc747 100644 --- a/internal/lsp/testdata/godef/b/b.go.golden +++ b/internal/lsp/testdata/godef/b/b.go.golden @@ -57,7 +57,7 @@ foo/foo.go:1:1-30:16: defined here as myFoo "golang.org/x/tools/internal/lsp/foo "end": { "line": 30, "column": 16, - "offset": 844 + "offset": 922 } }, "description": "myFoo \"golang.org/x/tools/internal/lsp/foo\" //@mark(myFoo, \"myFoo\"),godef(\"foo\", PackageFoo),godef(\"myFoo\", myFoo)"