From 2e68ad74ea7fea8e1e2c172cb58407eacc2228eb Mon Sep 17 00:00:00 2001
From: Muir Manders <muir@mnd.rs>
Date: Tue, 17 Sep 2019 15:10:05 -0700
Subject: [PATCH] internal/lsp: fix scope of FuncType completion candidates

Fix objects defined in the function signature to only be completable
inside the function body. For example:

func (dog Dog) bark(d<>) { // Don't complete <> to "dog".
  d<> // Do complete <> to "dog".
}

Change-Id: Ic9a2dc2ce6771212780f2d6af2221a67d203f35f
Reviewed-on: https://go-review.googlesource.com/c/tools/+/196559
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
---
 internal/lsp/source/completion.go         | 13 +++++++++++--
 internal/lsp/testdata/funcsig/func_sig.go |  9 +++++++++
 internal/lsp/tests/tests.go               |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 internal/lsp/testdata/funcsig/func_sig.go

diff --git a/internal/lsp/source/completion.go b/internal/lsp/source/completion.go
index 651c0b2b9f9..b302a18ba6a 100644
--- a/internal/lsp/source/completion.go
+++ b/internal/lsp/source/completion.go
@@ -563,11 +563,16 @@ func (c *completer) methodsAndFields(typ types.Type, addressable bool) error {
 func (c *completer) lexical() error {
 	var scopes []*types.Scope // scopes[i], where i<len(path), is the possibly nil Scope of path[i].
 	for _, n := range c.path {
+		// Include *FuncType scope if pos is inside the function body.
 		switch node := n.(type) {
 		case *ast.FuncDecl:
-			n = node.Type
+			if node.Body != nil && nodeContains(node.Body, c.pos) {
+				n = node.Type
+			}
 		case *ast.FuncLit:
-			n = node.Type
+			if node.Body != nil && nodeContains(node.Body, c.pos) {
+				n = node.Type
+			}
 		}
 		scopes = append(scopes, c.pkg.GetTypesInfo().Scopes[n])
 	}
@@ -654,6 +659,10 @@ func (c *completer) lexical() error {
 	return nil
 }
 
+func nodeContains(n ast.Node, pos token.Pos) bool {
+	return n != nil && n.Pos() <= pos && pos < n.End()
+}
+
 func (c *completer) inConstDecl() bool {
 	for _, n := range c.path {
 		if decl, ok := n.(*ast.GenDecl); ok && decl.Tok == token.CONST {
diff --git a/internal/lsp/testdata/funcsig/func_sig.go b/internal/lsp/testdata/funcsig/func_sig.go
new file mode 100644
index 00000000000..00f9b575d3c
--- /dev/null
+++ b/internal/lsp/testdata/funcsig/func_sig.go
@@ -0,0 +1,9 @@
+package funcsig
+
+type someType int //@item(sigSomeType, "someType", "int", "type")
+
+// Don't complete "foo" in signature.
+func (foo someType) _() { //@item(sigFoo, "foo", "someType", "var"),complete(") {", sigSomeType)
+
+	//@complete("", sigFoo, sigSomeType)
+}
diff --git a/internal/lsp/tests/tests.go b/internal/lsp/tests/tests.go
index 21241ac4152..d6c29302ff2 100644
--- a/internal/lsp/tests/tests.go
+++ b/internal/lsp/tests/tests.go
@@ -29,7 +29,7 @@ import (
 // We hardcode the expected number of test cases to ensure that all tests
 // are being executed. If a test is added, this number must be changed.
 const (
-	ExpectedCompletionsCount           = 152
+	ExpectedCompletionsCount           = 154
 	ExpectedCompletionSnippetCount     = 36
 	ExpectedUnimportedCompletionsCount = 1
 	ExpectedDeepCompletionsCount       = 5