qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 15:44:41 -07:00
Code Releases Activity

internal/lsp: fix error handling when getting go.mod codelens

Browse Source 
This change has a fix for mod/codelens: check if we get an error from ParseModHandles().Upgrades(). This change also only runs codelens on save.

Change-Id: I6dab7ddf3a08c650e4c670b039b1e99153ec8187
Reviewed-on: https://go-review.googlesource.com/c/tools/+/219478
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Run-TryBot: Rohan Challa <rohan@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Rohan Challa 2020-02-14 11:52:17 -05:00
parent 9976379007
commit bc664416c6
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/lsp/cache/snapshot.go vendored
View File

@ -476,6 +476,14 @@ func (s *snapshot) IsOpen(uri span.URI) bool {
return open
}
func (s *snapshot) IsSaved(uri span.URI) bool {
s.mu.Lock()
defer s.mu.Unlock()
ovl, open := s.files[uri].(*overlay)
return !open || ovl.saved
}
func (s *snapshot) awaitLoaded(ctx context.Context) error {
// Do not return results until the snapshot's view has been initialized.
s.view.awaitInitialized(ctx)

3
internal/lsp/mod/code_lens.go
View File

@ -29,6 +29,9 @@ func CodeLens(ctx context.Context, snapshot source.Snapshot, uri span.URI) ([]pr
return nil, err
}
f, m, upgrades, err := pmh.Upgrades(ctx)
if err != nil {
return nil, err
}
var codelens []protocol.CodeLens
for _, req := range f.Require {
dep := req.Mod.Path

8
internal/lsp/server.go
View File

@ -75,8 +75,10 @@ func (s *Server) codeLens(ctx context.Context, params *protocol.CodeLensParams)
if err != nil {
return nil, err
}
snapshot := view.Snapshot()
fh, err := snapshot.GetFile(uri)
if !view.Snapshot().IsSaved(uri) {
return nil, nil
}
fh, err := view.Snapshot().GetFile(uri)
if err != nil {
return nil, err
}
@ -84,7 +86,7 @@ func (s *Server) codeLens(ctx context.Context, params *protocol.CodeLensParams)
case source.Go:
return nil, nil
case source.Mod:
return mod.CodeLens(ctx, snapshot, uri)
return mod.CodeLens(ctx, view.Snapshot(), uri)
}
return nil, nil
}

6
internal/lsp/source/view.go
View File

@ -33,10 +33,12 @@ type Snapshot interface {
// if it is not already part of the view.
GetFile(uri span.URI) (FileHandle, error)
// IsOpen returns whether the editor currently has a file open,
// and if its contents are saved on disk or not.
// IsOpen returns whether the editor currently has a file open.
IsOpen(uri span.URI) bool
// IsSaved returns whether the contents are saved on disk or not.
IsSaved(uri span.URI) bool
// Analyze runs the analyses for the given package at this snapshot.
Analyze(ctx context.Context, id string, analyzers []*analysis.Analyzer) ([]*Error, error)