close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal/lsp: suppress error message when there is no config 

Change-Id: I04d26ec3967f6515703142a11fc88b115890ab59
Reviewed-on: https://go-review.googlesource.com/c/tools/+/170185
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Rebecca Stambler 2019-04-01 16:15:58 -04:00
parent 5bca5db4cb
commit 36ba6a502a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/lsp/server.go
View File

@ -632,10 +632,13 @@ func (s *Server) FoldingRanges(context.Context, *protocol.FoldingRangeParams) ([
} }
func (s *Server) processConfig(view *cache.View, config interface{}) error { func (s *Server) processConfig(view *cache.View, config interface{}) error {
//TODO: we should probably store and process more of the config // TODO: We should probably store and process more of the config.
if config == nil {
return nil // ignore error if you don't have a config
}
c, ok := config.(map[string]interface{}) c, ok := config.(map[string]interface{})
if !ok { if !ok {
return fmt.Errorf("Invalid config gopls type %T", config) return fmt.Errorf("invalid config gopls type %T", config)
} }
env := c["env"] env := c["env"]
if env == nil { if env == nil {
@ -643,7 +646,7 @@ func (s *Server) processConfig(view *cache.View, config interface{}) error {
} }
menv, ok := env.(map[string]interface{}) menv, ok := env.(map[string]interface{})
if !ok { if !ok {
return fmt.Errorf("Invalid config gopls.env type %T", env) return fmt.Errorf("invalid config gopls.env type %T", env)
} }
for k, v := range menv { for k, v := range menv {
view.Config.Env = applyEnv(view.Config.Env, k, v) view.Config.Env = applyEnv(view.Config.Env, k, v)