From ddb90ecd31bf8b6db4ddb50ba6aac035403fc914 Mon Sep 17 00:00:00 2001 From: Robert Findley Date: Tue, 2 Aug 2022 22:22:57 -0400 Subject: [PATCH] internal/lsp/cache: fix data races to view.options Use the concurrency-safe view.Options method. Fixes golang/go#54214 Change-Id: If75a544ae477ee7361540c3933a18e3366d8ffd7 Reviewed-on: https://go-review.googlesource.com/c/tools/+/420954 Run-TryBot: Robert Findley gopls-CI: kokoro TryBot-Result: Gopher Robot Reviewed-by: Dylan Le --- internal/lsp/cache/load.go | 2 +- internal/lsp/cache/view.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/lsp/cache/load.go b/internal/lsp/cache/load.go index 9d84891911..ca906c8287 100644 --- a/internal/lsp/cache/load.go +++ b/internal/lsp/cache/load.go @@ -141,7 +141,7 @@ func (s *snapshot) load(ctx context.Context, allowNetwork bool, scopes ...interf } moduleErrs := make(map[string][]packages.Error) // module path -> errors - filterer := buildFilterer(s.view.rootURI.Filename(), s.view.gomodcache, s.view.options) + filterer := buildFilterer(s.view.rootURI.Filename(), s.view.gomodcache, s.view.Options()) newMetadata := make(map[PackageID]*KnownMetadata) for _, pkg := range pkgs { // The Go command returns synthetic list results for module queries that diff --git a/internal/lsp/cache/view.go b/internal/lsp/cache/view.go index 0a64b76306..cddd4fa5d6 100644 --- a/internal/lsp/cache/view.go +++ b/internal/lsp/cache/view.go @@ -392,7 +392,7 @@ func (s *snapshot) locateTemplateFiles(ctx context.Context) { relativeTo := s.view.folder.Filename() searched := 0 - filterer := buildFilterer(dir, s.view.gomodcache, s.view.options) + filterer := buildFilterer(dir, s.view.gomodcache, s.view.Options()) // Change to WalkDir when we move up to 1.16 err := filepath.Walk(dir, func(path string, fi os.FileInfo, err error) error { if err != nil {