aboutsummaryrefslogtreecommitdiff
path: root/gopls/internal/hooks/hooks.go
diff options
context:
space:
mode:
Diffstat (limited to 'gopls/internal/hooks/hooks.go')
-rw-r--r--gopls/internal/hooks/hooks.go25
1 files changed, 11 insertions, 14 deletions
diff --git a/gopls/internal/hooks/hooks.go b/gopls/internal/hooks/hooks.go
index 023aefeab..5624a5eb3 100644
--- a/gopls/internal/hooks/hooks.go
+++ b/gopls/internal/hooks/hooks.go
@@ -8,27 +8,24 @@
package hooks // import "golang.org/x/tools/gopls/internal/hooks"
import (
- "context"
-
- "golang.org/x/tools/gopls/internal/vulncheck"
- "golang.org/x/tools/internal/lsp/source"
- "mvdan.cc/gofumpt/format"
+ "golang.org/x/tools/gopls/internal/lsp/source"
+ "golang.org/x/tools/internal/diff"
"mvdan.cc/xurls/v2"
)
func Options(options *source.Options) {
options.LicensesText = licensesText
if options.GoDiff {
- options.ComputeEdits = ComputeEdits
+ switch options.NewDiff {
+ case "old":
+ options.ComputeEdits = ComputeEdits
+ case "new":
+ options.ComputeEdits = diff.Strings
+ default:
+ options.ComputeEdits = BothDiffs
+ }
}
options.URLRegexp = xurls.Relaxed()
- options.GofumptFormat = func(ctx context.Context, langVersion, modulePath string, src []byte) ([]byte, error) {
- return format.Source(src, format.Options{
- LangVersion: langVersion,
- ModulePath: modulePath,
- })
- }
updateAnalyzers(options)
-
- options.Govulncheck = vulncheck.Govulncheck
+ updateGofumpt(options)
}