mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gopls/internal/lsp/source: remove Govulncheck from Hooks 

Now lsp packages are moved to the gopls module where the vulncheck
implementation exists. We no longer need to inject govulncheck
through the hook.

Change-Id: Ia627f1abe4c626d254d3e72b778535d6cb1ab41e
Reviewed-on: https://go-review.googlesource.com/c/tools/+/429938
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Run-TryBot: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
Hana (Hyang-Ah) Kim 2022-09-11 18:04:30 -04:00 committed by Hyang-Ah Hana Kim
parent 678efe0184
commit a8b9ed3e93
5 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gopls/internal/hooks/hooks.go
View File

@ -11,7 +11,6 @@ import (
"context"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/gopls/internal/vulncheck"
"golang.org/x/tools/internal/diff"
"mvdan.cc/gofumpt/format"
"mvdan.cc/xurls/v2"
@ -37,6 +36,4 @@ func Options(options *source.Options) {
})
}
updateAnalyzers(options)
options.Govulncheck = vulncheck.Govulncheck
}

12
gopls/internal/lsp/cmd/vulncheck.go
View File

@ -12,7 +12,7 @@ import (
"os"
"golang.org/x/tools/go/packages"
"golang.org/x/tools/gopls/internal/lsp/source"
vulnchecklib "golang.org/x/tools/gopls/internal/vulncheck"
"golang.org/x/tools/internal/tool"
)
@ -54,6 +54,10 @@ func (v *vulncheck) DetailedHelp(f *flag.FlagSet) {
}
func (v *vulncheck) Run(ctx context.Context, args ...string) error {
if vulnchecklib.Govulncheck == nil {
return fmt.Errorf("vulncheck command is available only in gopls compiled with go1.18 or newer")
}
if len(args) > 1 {
return tool.CommandLineErrorf("vulncheck accepts at most one package pattern")
}
@ -68,9 +72,7 @@ func (v *vulncheck) Run(ctx context.Context, args ...string) error {
}
}
opts := source.DefaultOptions().Clone()
v.app.options(opts) // register hook
if opts == nil || opts.Hooks.Govulncheck == nil {
if vulnchecklib.Govulncheck == nil {
return fmt.Errorf("vulncheck feature is not available")
}
@ -81,7 +83,7 @@ func (v *vulncheck) Run(ctx context.Context, args ...string) error {
// inherit the current process's cwd and env.
}
res, err := opts.Hooks.Govulncheck(ctx, loadCfg, pattern)
res, err := vulnchecklib.Govulncheck(ctx, loadCfg, pattern)
if err != nil {
return fmt.Errorf("vulncheck failed: %v", err)
}

10
gopls/internal/lsp/command.go
View File

@ -20,13 +20,14 @@ import (
"golang.org/x/mod/modfile"
"golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/internal/event"
"golang.org/x/tools/internal/gocommand"
"golang.org/x/tools/gopls/internal/lsp/command"
"golang.org/x/tools/gopls/internal/lsp/debug"
"golang.org/x/tools/gopls/internal/lsp/progress"
"golang.org/x/tools/gopls/internal/lsp/protocol"
"golang.org/x/tools/gopls/internal/lsp/source"
"golang.org/x/tools/gopls/internal/vulncheck"
"golang.org/x/tools/internal/event"
"golang.org/x/tools/internal/gocommand"
"golang.org/x/tools/internal/span"
"golang.org/x/tools/internal/xcontext"
)
@ -829,7 +830,10 @@ func (c *commandHandler) RunVulncheckExp(ctx context.Context, args command.Vulnc
}, func(ctx context.Context, deps commandDeps) error {
view := deps.snapshot.View()
opts := view.Options()
if opts == nil || opts.Hooks.Govulncheck == nil {
// quickly test if gopls is compiled to support govulncheck
// by checking vulncheck.Govulncheck. Alternatively, we can continue and
// let the `gopls vulncheck` command fail. This is lighter-weight.
if vulncheck.Govulncheck == nil {
return errors.New("vulncheck feature is not available")
}

5
gopls/internal/lsp/source/options.go
View File

@ -49,7 +49,6 @@ import (
"golang.org/x/tools/go/analysis/passes/unsafeptr"
"golang.org/x/tools/go/analysis/passes/unusedresult"
"golang.org/x/tools/go/analysis/passes/unusedwrite"
"golang.org/x/tools/go/packages"
"golang.org/x/tools/gopls/internal/lsp/analysis/embeddirective"
"golang.org/x/tools/gopls/internal/lsp/analysis/fillreturns"
"golang.org/x/tools/gopls/internal/lsp/analysis/fillstruct"
@ -519,9 +518,6 @@ type Hooks struct {
TypeErrorAnalyzers map[string]*Analyzer
ConvenienceAnalyzers map[string]*Analyzer
StaticcheckAnalyzers map[string]*Analyzer
// Govulncheck is the implementation of the Govulncheck gopls command.
Govulncheck func(context.Context, *packages.Config, string) (command.VulncheckResult, error)
}
// InternalOptions contains settings that are not intended for use by the
@ -773,7 +769,6 @@ func (o *Options) Clone() *Options {
ComputeEdits: o.ComputeEdits,
GofumptFormat: o.GofumptFormat,
URLRegexp: o.URLRegexp,
Govulncheck: o.Govulncheck,
},
ServerOptions: o.ServerOptions,
UserOptions: o.UserOptions,

5
gopls/internal/vulncheck/vulncheck.go
View File

@ -10,7 +10,6 @@ package vulncheck
import (
"context"
"errors"
"golang.org/x/tools/go/packages"
"golang.org/x/tools/gopls/internal/lsp/command"
@ -18,6 +17,4 @@ import (
// Govulncheck runs the in-process govulncheck implementation.
// With go1.18+, this is swapped with the real implementation.
var Govulncheck = func(ctx context.Context, cfg *packages.Config, patterns string) (res command.VulncheckResult, _ error) {
return res, errors.New("not implemented")
}
var Govulncheck func(ctx context.Context, cfg *packages.Config, patterns string) (res command.VulncheckResult, _ error) = nil