Skip to content

Commit

Permalink
internal/lsp: don't add multiple views for the same folder
Browse files Browse the repository at this point in the history
When we add a view, we should check if we already have a view for the
given folder.

Updates golang/go#48844

Change-Id: I0de27d420e2b4df3b33b913ae27b108bab6b7d12
Reviewed-on: https://go-review.googlesource.com/c/tools/+/356933
Trust: Rebecca Stambler <rstambler@golang.org>
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
  • Loading branch information
stamblerre committed Oct 19, 2021
1 parent 81f084e commit 4ea6123
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions internal/lsp/cache/session.go
Expand Up @@ -159,6 +159,11 @@ func (s *Session) Cache() interface{} {
func (s *Session) NewView(ctx context.Context, name string, folder, tempWorkspace span.URI, options *source.Options) (source.View, source.Snapshot, func(), error) {
s.viewMu.Lock()
defer s.viewMu.Unlock()
for _, view := range s.views {
if span.CompareURI(view.folder, folder) == 0 {
return nil, nil, nil, source.ErrViewExists
}
}
view, snapshot, release, err := s.createView(ctx, name, folder, tempWorkspace, options, 0)
if err != nil {
return nil, nil, func() {}, err
Expand Down
3 changes: 3 additions & 0 deletions internal/lsp/general.go
Expand Up @@ -232,6 +232,9 @@ func (s *Server) addFolders(ctx context.Context, folders []protocol.WorkspaceFol
}
work := s.progress.Start(ctx, "Setting up workspace", "Loading packages...", nil, nil)
snapshot, release, err := s.addView(ctx, folder.Name, uri)
if err == source.ErrViewExists {
continue
}
if err != nil {
viewErrors[uri] = err
work.End(fmt.Sprintf("Error loading packages: %s", err))
Expand Down
2 changes: 2 additions & 0 deletions internal/lsp/source/view.go
Expand Up @@ -373,6 +373,8 @@ type Session interface {
SetProgressTracker(tracker *progress.Tracker)
}

var ErrViewExists = errors.New("view already exists for session")

// Overlay is the type for a file held in memory on a session.
type Overlay interface {
VersionedFileHandle
Expand Down

0 comments on commit 4ea6123

Please sign in to comment.