commit 7653e6d3d5edc0ac8e4a3d0c9d9cdbf718618855
author Edward Muller <edwardam@interlix.com> Fri Jun 14 20:32:31 2019 +0000
committer Rebecca Stambler <rstambler@golang.org> Mon Jun 17 16:34:45 2019 +0000
tree 1ddc21e4aec4f239d4191579d02936d98379ff1b
parent 97de5656fd0abb4da8799a4c7235e596f1ae41e3

internal/lsp/cache: fix ineffectual err assignment

The `if err :=` block creates a shadow err value that is then discarded
after the block.

Change-Id: I78f6a7298ac5d3d86ece056a9e328bcee9fdc683

Change-Id: I78f6a7298ac5d3d86ece056a9e328bcee9fdc683
GitHub-Last-Rev: 4bac8fb982fa3a0724206422b1a4dbc5e41c34a9
GitHub-Pull-Request: golang/tools#114
Reviewed-on: https://go-review.googlesource.com/c/tools/+/181777
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Cottrell <iancottrell@google.com>

internal/lsp/cache/parse.go

diff --git a/internal/lsp/cache/parse.go b/internal/lsp/cache/parse.go
index fe7c4dd..3f7f868 100644
--- a/internal/lsp/cache/parse.go
+++ b/internal/lsp/cache/parse.go
@@ -232,7 +232,8 @@
 		}
 		switch n := n.(type) {
 		case *ast.BadStmt:
-			if err := parseDeferOrGoStmt(n, parent, tok, src); err != nil {
+			err = parseDeferOrGoStmt(n, parent, tok, src) // don't shadow err
+			if err != nil {
 				err = fmt.Errorf("unable to parse defer or go from *ast.BadStmt: %v", err)
 			}
 			return false