Skip to content

Commit

Permalink
gopls: migrate internal/lsp to gopls/internal/lsp
Browse files Browse the repository at this point in the history 
This CL was created using the following commands:

    ./gopls/internal/migrate.sh
    git add .
    git codereview gofmt

For golang/go#54509

Change-Id: Iceeec602748a5e6f609c3ceda8d19157e5c94009
Reviewed-on: https://go-review.googlesource.com/c/tools/+/426796
gopls-CI: kokoro <noreply+kokoro@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
Reviewed-by: Peter Weinberger <pjw@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
  • Loading branch information
@findleyr
findleyr committed Sep 7, 2022
1 parent dd1bab2 commit b15dac2
Show file tree
Hide file tree
Showing 864 changed files with 670 additions and 666 deletions.
2 changes: 1 addition & 1 deletion copyright/copyright.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func checkFile(toolsDir, filename string) (bool, error) {
return shouldAddCopyright, nil
}

// Copied from golang.org/x/tools/internal/lsp/source/util.go.
// Copied from golang.org/x/tools/gopls/internal/lsp/source/util.go.
// Matches cgo generated comment as well as the proposed standard:
//
// https://golang.org/s/generatedcode
Expand Down
4 changes: 2 additions & 2 deletions go/analysis/analysistest/analysistest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/analysis/internal/checker"
"golang.org/x/tools/go/packages"
"golang.org/x/tools/internal/lsp/diff"
"golang.org/x/tools/internal/lsp/diff/myers"
"golang.org/x/tools/internal/diff"
"golang.org/x/tools/internal/diff/myers"
"golang.org/x/tools/internal/span"
"golang.org/x/tools/internal/testenv"
"golang.org/x/tools/txtar"
Expand Down
6 changes: 3 additions & 3 deletions gopls/api-diff/api_diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"path/filepath"
"strings"

"golang.org/x/tools/gopls/internal/lsp/source"
difflib "golang.org/x/tools/internal/diff"
"golang.org/x/tools/internal/diff/myers"
"golang.org/x/tools/internal/gocommand"
difflib "golang.org/x/tools/internal/lsp/diff"
"golang.org/x/tools/internal/lsp/diff/myers"
"golang.org/x/tools/internal/lsp/source"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gopls/doc/contributing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ claiming it.

## Getting started

Most of the `gopls` logic is actually in the `golang.org/x/tools/internal/lsp`
Most of the `gopls` logic is actually in the `golang.org/x/tools/gopls/internal/lsp`
directory, so you are most likely to develop in the golang.org/x/tools module.

## Build
Expand Down
4 changes: 2 additions & 2 deletions gopls/doc/design/integrating.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ For instance, files that are needed to do correct type checking are modified by
Monitoring files inside gopls directly has a lot of awkward problems, but the [LSP specification] has methods that allow gopls to request that the client notify it of file system changes, specifically [`workspace/didChangeWatchedFiles`].
This is currently being added to gopls by a community member, and tracked in [#31553]

[InitializeResult]: https://pkg.go.dev/golang.org/x/tools/internal/lsp/protocol#InitializeResult
[ServerCapabilities]: https://pkg.go.dev/golang.org/x/tools/internal/lsp/protocol#ServerCapabilities
[InitializeResult]: https://pkg.go.dev/golang.org/x/tools/gopls/internal/lsp/protocol#InitializeResult
[ServerCapabilities]: https://pkg.go.dev/golang.org/x/tools/gopls/internal/lsp/protocol#ServerCapabilities
[`golang.org/x/tools/internal/span`]: https://pkg.go.dev/golang.org/x/tools/internal/span#NewPoint

[LSP specification]: https://microsoft.github.io/language-server-protocol/specifications/specification-3-14/
Expand Down
14 changes: 7 additions & 7 deletions gopls/doc/generate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"github.com/jba/printsrc"
"golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/packages"
"golang.org/x/tools/internal/lsp/command"
"golang.org/x/tools/internal/lsp/command/commandmeta"
"golang.org/x/tools/internal/lsp/mod"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/gopls/internal/lsp/command"
"golang.org/x/tools/gopls/internal/lsp/command/commandmeta"
"golang.org/x/tools/gopls/internal/lsp/mod"
"golang.org/x/tools/gopls/internal/lsp/source"
)

func main() {
Expand All @@ -52,7 +52,7 @@ func doMain(write bool) (bool, error) {
return false, err
}

sourceDir, err := pkgDir("golang.org/x/tools/internal/lsp/source")
sourceDir, err := pkgDir("golang.org/x/tools/gopls/internal/lsp/source")
if err != nil {
return false, err
}
Expand Down Expand Up @@ -96,7 +96,7 @@ func loadAPI() (*source.APIJSON, error) {
&packages.Config{
Mode: packages.NeedTypes | packages.NeedTypesInfo | packages.NeedSyntax | packages.NeedDeps,
},
"golang.org/x/tools/internal/lsp/source",
"golang.org/x/tools/gopls/internal/lsp/source",
)
if err != nil {
return nil, err
Expand Down Expand Up @@ -587,7 +587,7 @@ func rewriteFile(file string, api *source.APIJSON, write bool, rewrite func([]by
func rewriteAPI(_ []byte, api *source.APIJSON) ([]byte, error) {
var buf bytes.Buffer
fmt.Fprintf(&buf, "// Code generated by \"golang.org/x/tools/gopls/doc/generate\"; DO NOT EDIT.\n\npackage source\n\nvar GeneratedAPIJSON = ")
if err := printsrc.NewPrinter("golang.org/x/tools/internal/lsp/source").Fprint(&buf, api); err != nil {
if err := printsrc.NewPrinter("golang.org/x/tools/gopls/internal/lsp/source").Fprint(&buf, api); err != nil {
return nil, err
}
return format.Source(buf.Bytes())
Expand Down
2 changes: 1 addition & 1 deletion gopls/doc/settings.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Settings

<!--TODO: Generate this file from the documentation in golang/org/x/tools/internal/lsp/source/options.go.-->
<!--TODO: Generate this file from the documentation in golang.org/x/tools/gopls/internal/lsp/source/options.go.-->

This document describes the global settings for `gopls` inside the editor.
The settings block will be called `"gopls"` and contains a collection of
Expand Down
10 changes: 7 additions & 3 deletions gopls/internal/coverage/coverage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@
// -o controls where the coverage file is written, defaulting to /tmp/cover.out
// -i coverage-file will generate the report from an existing coverage file
// -v controls verbosity (0: only report coverage, 1: report as each directory is finished,
// 2: report on each test, 3: more details, 4: too much)
//
// 2: report on each test, 3: more details, 4: too much)
//
// -t tests only tests packages in the given comma-separated list of directories in gopls.
// The names should start with ., as in ./internal/regtest/bench
//
// The names should start with ., as in ./internal/regtest/bench
//
// -run tests. If set, -run tests is passed on to the go test command.
//
// Despite gopls' use of goroutines, the counts are almost deterministic.
Expand Down Expand Up @@ -60,7 +64,7 @@ func main() {
tests = realTestName(tests)

// report coverage for packages under internal/lsp
parg := "golang.org/x/tools/internal/lsp/..."
parg := "golang.org/x/tools/gopls/internal/lsp/..."

accum := []string{}
seen := make(map[string]bool)
Expand Down
4 changes: 2 additions & 2 deletions gopls/internal/hooks/analysis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
package hooks

import (
"golang.org/x/tools/internal/lsp/protocol"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/gopls/internal/lsp/protocol"
"golang.org/x/tools/gopls/internal/lsp/source"
"honnef.co/go/tools/analysis/lint"
"honnef.co/go/tools/quickfix"
"honnef.co/go/tools/simple"
Expand Down
2 changes: 1 addition & 1 deletion gopls/internal/hooks/analysis_117.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

package hooks

import "golang.org/x/tools/internal/lsp/source"
import "golang.org/x/tools/gopls/internal/lsp/source"

func updateAnalyzers(options *source.Options) {
options.StaticcheckSupported = false
Expand Down
2 changes: 1 addition & 1 deletion gopls/internal/hooks/diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"unicode"

"github.com/sergi/go-diff/diffmatchpatch"
"golang.org/x/tools/internal/lsp/diff"
"golang.org/x/tools/internal/diff"
"golang.org/x/tools/internal/span"
)

Expand Down
2 changes: 1 addition & 1 deletion gopls/internal/hooks/diff_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"unicode/utf8"

"golang.org/x/tools/internal/lsp/diff/difftest"
"golang.org/x/tools/internal/diff/difftest"
)

func TestDiff(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions gopls/internal/hooks/hooks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ package hooks // import "golang.org/x/tools/gopls/internal/hooks"
import (
"context"

"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/gopls/internal/vulncheck"
"golang.org/x/tools/internal/lsp/diff"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/diff"
"mvdan.cc/gofumpt/format"
"mvdan.cc/xurls/v2"
)
Expand Down
0 internal/lsp/README.md → gopls/internal/lsp/README.md
View file
File renamed without changes.
0 ...analysis/embeddirective/embeddirective.go → ...analysis/embeddirective/embeddirective.go
View file
File renamed without changes.
0 ...sis/embeddirective/embeddirective_test.go → ...sis/embeddirective/embeddirective_test.go
View file
File renamed without changes.
0 ...alysis/embeddirective/testdata/src/a/a.go → ...alysis/embeddirective/testdata/src/a/a.go
View file
File renamed without changes.
0 ...alysis/embeddirective/testdata/src/a/b.go → ...alysis/embeddirective/testdata/src/a/b.go
View file
File renamed without changes.
0 ...s/embeddirective/testdata/src/a/embedText → ...s/embeddirective/testdata/src/a/embedText
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...l/lsp/analysis/fillreturns/fillreturns.go → ...l/lsp/analysis/fillreturns/fillreturns.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/internal/analysisinternal"
"golang.org/x/tools/internal/lsp/fuzzy"
"golang.org/x/tools/internal/fuzzy"
"golang.org/x/tools/internal/typeparams"
)

Expand Down
2 changes: 1 addition & 1 deletion .../analysis/fillreturns/fillreturns_test.go → .../analysis/fillreturns/fillreturns_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/fillreturns"
"golang.org/x/tools/gopls/internal/lsp/analysis/fillreturns"
"golang.org/x/tools/internal/typeparams"
)

Expand Down
0 .../analysis/fillreturns/testdata/src/a/a.go → .../analysis/fillreturns/testdata/src/a/a.go
View file
File renamed without changes.
0 ...is/fillreturns/testdata/src/a/a.go.golden → ...is/fillreturns/testdata/src/a/a.go.golden
View file
File renamed without changes.
0 ...illreturns/testdata/src/a/typeparams/a.go → ...illreturns/testdata/src/a/typeparams/a.go
View file
File renamed without changes.
0 ...rns/testdata/src/a/typeparams/a.go.golden → ...rns/testdata/src/a/typeparams/a.go.golden
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nal/lsp/analysis/fillstruct/fillstruct.go → ...nal/lsp/analysis/fillstruct/fillstruct.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/ast/inspector"
"golang.org/x/tools/internal/analysisinternal"
"golang.org/x/tools/internal/lsp/fuzzy"
"golang.org/x/tools/internal/fuzzy"
"golang.org/x/tools/internal/span"
"golang.org/x/tools/internal/typeparams"
)
Expand Down
2 changes: 1 addition & 1 deletion ...sp/analysis/fillstruct/fillstruct_test.go → ...sp/analysis/fillstruct/fillstruct_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/fillstruct"
"golang.org/x/tools/gopls/internal/lsp/analysis/fillstruct"
"golang.org/x/tools/internal/typeparams"
)

Expand Down
0 ...p/analysis/fillstruct/testdata/src/a/a.go → ...p/analysis/fillstruct/testdata/src/a/a.go
View file
File renamed without changes.
0 ...p/analysis/fillstruct/testdata/src/b/b.go → ...p/analysis/fillstruct/testdata/src/b/b.go
View file
File renamed without changes.
0 ...uct/testdata/src/typeparams/typeparams.go → ...uct/testdata/src/typeparams/typeparams.go
View file
File renamed without changes.
0 ...p/analysis/infertypeargs/infertypeargs.go → ...p/analysis/infertypeargs/infertypeargs.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lysis/infertypeargs/infertypeargs_test.go → ...lysis/infertypeargs/infertypeargs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/infertypeargs"
"golang.org/x/tools/gopls/internal/lsp/analysis/infertypeargs"
"golang.org/x/tools/internal/testenv"
"golang.org/x/tools/internal/typeparams"
)
Expand Down
0 ...l/lsp/analysis/infertypeargs/run_go117.go → ...l/lsp/analysis/infertypeargs/run_go117.go
View file
File renamed without changes.
0 ...l/lsp/analysis/infertypeargs/run_go118.go → ...l/lsp/analysis/infertypeargs/run_go118.go
View file
File renamed without changes.
0 ...sis/infertypeargs/testdata/src/a/basic.go → ...sis/infertypeargs/testdata/src/a/basic.go
View file
File renamed without changes.
0 ...ertypeargs/testdata/src/a/basic.go.golden → ...ertypeargs/testdata/src/a/basic.go.golden
View file
File renamed without changes.
0 .../infertypeargs/testdata/src/a/imported.go → .../infertypeargs/testdata/src/a/imported.go
View file
File renamed without changes.
0 ...ypeargs/testdata/src/a/imported.go.golden → ...ypeargs/testdata/src/a/imported.go.golden
View file
File renamed without changes.
0 ...eargs/testdata/src/a/imported/imported.go → ...eargs/testdata/src/a/imported/imported.go
View file
File renamed without changes.
0 ...ertypeargs/testdata/src/a/notypechange.go → ...ertypeargs/testdata/src/a/notypechange.go
View file
File renamed without changes.
0 ...rgs/testdata/src/a/notypechange.go.golden → ...rgs/testdata/src/a/notypechange.go.golden
View file
File renamed without changes.
0 internal/lsp/analysis/nonewvars/nonewvars.go → ...ernal/lsp/analysis/nonewvars/nonewvars.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../lsp/analysis/nonewvars/nonewvars_test.go → .../lsp/analysis/nonewvars/nonewvars_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/nonewvars"
"golang.org/x/tools/gopls/internal/lsp/analysis/nonewvars"
"golang.org/x/tools/internal/typeparams"
)

Expand Down
0 ...sp/analysis/nonewvars/testdata/src/a/a.go → ...sp/analysis/nonewvars/testdata/src/a/a.go
View file
File renamed without changes.
0 ...ysis/nonewvars/testdata/src/a/a.go.golden → ...ysis/nonewvars/testdata/src/a/a.go.golden
View file
File renamed without changes.
0 ...is/nonewvars/testdata/src/typeparams/a.go → ...is/nonewvars/testdata/src/typeparams/a.go
View file
File renamed without changes.
0 ...wvars/testdata/src/typeparams/a.go.golden → ...wvars/testdata/src/typeparams/a.go.golden
View file
File renamed without changes.
0 ...analysis/noresultvalues/noresultvalues.go → ...analysis/noresultvalues/noresultvalues.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...sis/noresultvalues/noresultvalues_test.go → ...sis/noresultvalues/noresultvalues_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/noresultvalues"
"golang.org/x/tools/gopls/internal/lsp/analysis/noresultvalues"
"golang.org/x/tools/internal/typeparams"
)

Expand Down
0 ...alysis/noresultvalues/testdata/src/a/a.go → ...alysis/noresultvalues/testdata/src/a/a.go
View file
File renamed without changes.
0 ...noresultvalues/testdata/src/a/a.go.golden → ...noresultvalues/testdata/src/a/a.go.golden
View file
File renamed without changes.
0 ...resultvalues/testdata/src/typeparams/a.go → ...resultvalues/testdata/src/typeparams/a.go
View file
File renamed without changes.
0 ...alues/testdata/src/typeparams/a.go.golden → ...alues/testdata/src/typeparams/a.go.golden
View file
File renamed without changes.
0 ...plifycompositelit/simplifycompositelit.go → ...plifycompositelit/simplifycompositelit.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...compositelit/simplifycompositelit_test.go → ...compositelit/simplifycompositelit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/simplifycompositelit"
"golang.org/x/tools/gopls/internal/lsp/analysis/simplifycompositelit"
)

func Test(t *testing.T) {
Expand Down
0 .../simplifycompositelit/testdata/src/a/a.go → .../simplifycompositelit/testdata/src/a/a.go
View file
File renamed without changes.
0 ...fycompositelit/testdata/src/a/a.go.golden → ...fycompositelit/testdata/src/a/a.go.golden
View file
File renamed without changes.
0 ...p/analysis/simplifyrange/simplifyrange.go → ...p/analysis/simplifyrange/simplifyrange.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lysis/simplifyrange/simplifyrange_test.go → ...lysis/simplifyrange/simplifyrange_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/simplifyrange"
"golang.org/x/tools/gopls/internal/lsp/analysis/simplifyrange"
)

func Test(t *testing.T) {
Expand Down
0 ...nalysis/simplifyrange/testdata/src/a/a.go → ...nalysis/simplifyrange/testdata/src/a/a.go
View file
File renamed without changes.
0 .../simplifyrange/testdata/src/a/a.go.golden → .../simplifyrange/testdata/src/a/a.go.golden
View file
File renamed without changes.
0 ...p/analysis/simplifyslice/simplifyslice.go → ...p/analysis/simplifyslice/simplifyslice.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lysis/simplifyslice/simplifyslice_test.go → ...lysis/simplifyslice/simplifyslice_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/simplifyslice"
"golang.org/x/tools/gopls/internal/lsp/analysis/simplifyslice"
"golang.org/x/tools/internal/typeparams"
)

Expand Down
0 ...nalysis/simplifyslice/testdata/src/a/a.go → ...nalysis/simplifyslice/testdata/src/a/a.go
View file
File renamed without changes.
0 .../simplifyslice/testdata/src/a/a.go.golden → .../simplifyslice/testdata/src/a/a.go.golden
View file
File renamed without changes.
0 ...ice/testdata/src/typeparams/typeparams.go → ...ice/testdata/src/typeparams/typeparams.go
View file
File renamed without changes.
0 ...tdata/src/typeparams/typeparams.go.golden → ...tdata/src/typeparams/typeparams.go.golden
View file
File renamed without changes.
0 ...l/lsp/analysis/stubmethods/stubmethods.go → ...l/lsp/analysis/stubmethods/stubmethods.go
View file
File renamed without changes.
0 ...alysis/undeclaredname/testdata/src/a/a.go → ...alysis/undeclaredname/testdata/src/a/a.go
View file
File renamed without changes.
0 ...undeclaredname/testdata/src/a/channels.go → ...undeclaredname/testdata/src/a/channels.go
View file
File renamed without changes.
0 ...name/testdata/src/a/consecutive_params.go → ...name/testdata/src/a/consecutive_params.go
View file
File renamed without changes.
0 ...eclaredname/testdata/src/a/error_param.go → ...eclaredname/testdata/src/a/error_param.go
View file
File renamed without changes.
0 ...undeclaredname/testdata/src/a/literals.go → ...undeclaredname/testdata/src/a/literals.go
View file
File renamed without changes.
0 ...ndeclaredname/testdata/src/a/operation.go → ...ndeclaredname/testdata/src/a/operation.go
View file
File renamed without changes.
0 ...undeclaredname/testdata/src/a/selector.go → ...undeclaredname/testdata/src/a/selector.go
View file
File renamed without changes.
0 ...is/undeclaredname/testdata/src/a/slice.go → ...is/undeclaredname/testdata/src/a/slice.go
View file
File renamed without changes.
0 ...is/undeclaredname/testdata/src/a/tuple.go → ...is/undeclaredname/testdata/src/a/tuple.go
View file
File renamed without changes.
0 ...laredname/testdata/src/a/unique_params.go → ...laredname/testdata/src/a/unique_params.go
View file
File renamed without changes.
0 ...lsp/analysis/undeclaredname/undeclared.go → ...lsp/analysis/undeclaredname/undeclared.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nalysis/undeclaredname/undeclared_test.go → ...nalysis/undeclaredname/undeclared_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/undeclaredname"
"golang.org/x/tools/gopls/internal/lsp/analysis/undeclaredname"
)

func Test(t *testing.T) {
Expand Down
0 ...analysis/unusedparams/testdata/src/a/a.go → ...analysis/unusedparams/testdata/src/a/a.go
View file
File renamed without changes.
0 ...s/unusedparams/testdata/src/a/a.go.golden → ...s/unusedparams/testdata/src/a/a.go.golden
View file
File renamed without changes.
0 ...ams/testdata/src/typeparams/typeparams.go → ...ams/testdata/src/typeparams/typeparams.go
View file
File renamed without changes.
0 ...tdata/src/typeparams/typeparams.go.golden → ...tdata/src/typeparams/typeparams.go.golden
View file
File renamed without changes.
0 ...lsp/analysis/unusedparams/unusedparams.go → ...lsp/analysis/unusedparams/unusedparams.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nalysis/unusedparams/unusedparams_test.go → ...nalysis/unusedparams/unusedparams_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/unusedparams"
"golang.org/x/tools/gopls/internal/lsp/analysis/unusedparams"
"golang.org/x/tools/internal/typeparams"
)

Expand Down
0 ...s/unusedvariable/testdata/src/assign/a.go → ...s/unusedvariable/testdata/src/assign/a.go
View file
File renamed without changes.
0 ...dvariable/testdata/src/assign/a.go.golden → ...dvariable/testdata/src/assign/a.go.golden
View file
File renamed without changes.
0 ...sis/unusedvariable/testdata/src/decl/a.go → ...sis/unusedvariable/testdata/src/decl/a.go
View file
File renamed without changes.
0 ...sedvariable/testdata/src/decl/a.go.golden → ...sedvariable/testdata/src/decl/a.go.golden
View file
File renamed without changes.
0 ...analysis/unusedvariable/unusedvariable.go → ...analysis/unusedvariable/unusedvariable.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...sis/unusedvariable/unusedvariable_test.go → ...sis/unusedvariable/unusedvariable_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/unusedvariable"
"golang.org/x/tools/gopls/internal/lsp/analysis/unusedvariable"
)

func Test(t *testing.T) {
Expand Down
0 ...l/lsp/analysis/useany/testdata/src/a/a.go → ...l/lsp/analysis/useany/testdata/src/a/a.go
View file
File renamed without changes.
0 ...nalysis/useany/testdata/src/a/a.go.golden → ...nalysis/useany/testdata/src/a/a.go.golden
View file
File renamed without changes.
0 internal/lsp/analysis/useany/useany.go → gopls/internal/lsp/analysis/useany/useany.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/lsp/analysis/useany/useany_test.go → ...ternal/lsp/analysis/useany/useany_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"golang.org/x/tools/go/analysis/analysistest"
"golang.org/x/tools/internal/lsp/analysis/useany"
"golang.org/x/tools/gopls/internal/lsp/analysis/useany"
"golang.org/x/tools/internal/typeparams"
)

Expand Down
0 internal/lsp/browser/README.md → gopls/internal/lsp/browser/README.md
View file
File renamed without changes.
0 internal/lsp/browser/browser.go → gopls/internal/lsp/browser/browser.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/lsp/cache/analysis.go → gopls/internal/lsp/cache/analysis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/internal/analysisinternal"
"golang.org/x/tools/internal/event"
"golang.org/x/tools/internal/lsp/debug/tag"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/event/tag"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/internal/memoize"
"golang.org/x/tools/internal/span"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/lsp/cache/cache.go → gopls/internal/lsp/cache/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"golang.org/x/tools/internal/event"
"golang.org/x/tools/internal/gocommand"
"golang.org/x/tools/internal/lsp/debug/tag"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/event/tag"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/internal/memoize"
"golang.org/x/tools/internal/span"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/lsp/cache/check.go → gopls/internal/lsp/cache/check.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/packages"
"golang.org/x/tools/internal/event"
"golang.org/x/tools/internal/lsp/bug"
"golang.org/x/tools/internal/lsp/debug/tag"
"golang.org/x/tools/internal/lsp/protocol"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/bug"
"golang.org/x/tools/internal/event/tag"
"golang.org/x/tools/gopls/internal/lsp/protocol"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/internal/memoize"
"golang.org/x/tools/internal/packagesinternal"
"golang.org/x/tools/internal/span"
Expand Down
0 internal/lsp/cache/debug.go → gopls/internal/lsp/cache/debug.go
View file
File renamed without changes.
0 internal/lsp/cache/error_test.go → gopls/internal/lsp/cache/error_test.go
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions internal/lsp/cache/errors.go → gopls/internal/lsp/cache/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/packages"
"golang.org/x/tools/internal/analysisinternal"
"golang.org/x/tools/internal/lsp/bug"
"golang.org/x/tools/internal/lsp/command"
"golang.org/x/tools/internal/lsp/protocol"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/bug"
"golang.org/x/tools/gopls/internal/lsp/command"
"golang.org/x/tools/gopls/internal/lsp/protocol"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/internal/span"
"golang.org/x/tools/internal/typesinternal"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/lsp/cache/graph.go → gopls/internal/lsp/cache/graph.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package cache
import (
"sort"

"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/internal/span"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/lsp/cache/imports.go → gopls/internal/lsp/cache/imports.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"golang.org/x/tools/internal/event/keys"
"golang.org/x/tools/internal/gocommand"
"golang.org/x/tools/internal/imports"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/gopls/internal/lsp/source"
)

type importsState struct {
Expand Down
0 internal/lsp/cache/keys.go → gopls/internal/lsp/cache/keys.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions internal/lsp/cache/load.go → gopls/internal/lsp/cache/load.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"golang.org/x/tools/go/packages"
"golang.org/x/tools/internal/event"
"golang.org/x/tools/internal/gocommand"
"golang.org/x/tools/internal/lsp/debug/tag"
"golang.org/x/tools/internal/lsp/protocol"
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/event/tag"
"golang.org/x/tools/gopls/internal/lsp/protocol"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/internal/packagesinternal"
"golang.org/x/tools/internal/span"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/lsp/cache/maps.go → gopls/internal/lsp/cache/maps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package cache

import (
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/internal/persistent"
"golang.org/x/tools/internal/span"
)
Expand Down
Loading

0 comments on commit b15dac2

Please sign in to comment.