mirror of
https://github.com/golang/go
synced 2024-10-01 08:28:43 -06:00
431033348d
Previously we would always expand *types.Func completion candidates to
function calls, even if the expected type matched the function itself,
not its return value. Now we check the function itself before we check
its return value. This fixes cases like this:
func foo() int { return 0 }
var f func() int
f = <foo> // now completes to "foo" instead of "foo()"
Also, *types.Var function values were never getting expanded to calls.
I fixed the completion formatting to know that both *types.Func
and *types.Var objects might need to be invoked in the completion
item. This fixes cases like this:
foo := func() int { return 0 }
var i int
i = <foo()> // now completes to "foo()" instead of "foo"
Change-Id: I8d0e9e2774f92866a3dd881092c13019fb3f3fd5
GitHub-Last-Rev: 7442bc84b5bbb86296289bbc745ec56a5f89d901
GitHub-Pull-Request: golang/tools#122
Reviewed-on: https://go-review.googlesource.com/c/tools/+/182879
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
28 lines
673 B
Go
28 lines
673 B
Go
package funcvalue
|
|
|
|
func fooFunc() int { //@item(fvFooFunc, "fooFunc", "func() int", "func")
|
|
return 0
|
|
}
|
|
|
|
var _ = fooFunc() //@item(fvFooFuncCall, "fooFunc()", "int", "func")
|
|
|
|
var fooVar = func() int { //@item(fvFooVar, "fooVar", "func() int", "var")
|
|
return 0
|
|
}
|
|
|
|
var _ = fooVar() //@item(fvFooVarCall, "fooVar()", "int", "var")
|
|
|
|
type myFunc func() int
|
|
|
|
var fooType myFunc = fooVar //@item(fvFooType, "fooType", "myFunc", "var")
|
|
|
|
var _ = fooType() //@item(fvFooTypeCall, "fooType()", "int", "var")
|
|
|
|
func _() {
|
|
var f func() int
|
|
f = foo //@complete(" //", fvFooFunc, fvFooType, fvFooVar)
|
|
|
|
var i int
|
|
i = foo //@complete(" //", fvFooFuncCall, fvFooTypeCall, fvFooVarCall)
|
|
}
|