From 98f1b4dee82ca3ded542b3c37a62f58f0eb744b7 Mon Sep 17 00:00:00 2001 From: Rob Findley Date: Wed, 31 May 2023 17:58:19 -0400 Subject: [PATCH] gopls/internal/lsp/cache: check number of orphaned files after filtering I noticed redundant "reloadOrphanedFiles reloading" logs in https://storage.googleapis.com/go-build-log/0b9348fc/openbsd-amd64-72_04342286.log This is because we were checking for no reloadable files before filtering out unloadable files, not after. Fix this logic error. Change-Id: Ib7ad122bb7f96fdf53474c329fac1ec8ec0e1ef3 Reviewed-on: https://go-review.googlesource.com/c/tools/+/499755 TryBot-Result: Gopher Robot Run-TryBot: Robert Findley gopls-CI: kokoro Reviewed-by: Alan Donovan --- gopls/internal/lsp/cache/snapshot.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gopls/internal/lsp/cache/snapshot.go b/gopls/internal/lsp/cache/snapshot.go index 7e0a9ba196b..bff3dc17f63 100644 --- a/gopls/internal/lsp/cache/snapshot.go +++ b/gopls/internal/lsp/cache/snapshot.go @@ -1605,9 +1605,6 @@ func (s *snapshot) reloadOrphanedOpenFiles(ctx context.Context) error { files = append(files, o) } } - if len(files) == 0 { - return nil - } // Filter to files that are not known to be unloadable. s.mu.Lock() @@ -1620,6 +1617,10 @@ func (s *snapshot) reloadOrphanedOpenFiles(ctx context.Context) error { files = loadable s.mu.Unlock() + if len(files) == 0 { + return nil + } + var uris []span.URI for _, file := range files { uris = append(uris, file.URI())