mirror of
https://github.com/golang/go
synced 2024-11-18 16:14:46 -07:00
internal/lsp: improve completion in append() calls
Add a special case for append() arguments so we infer the expected type from the append() context. For example: var foo []int foo = append(<>) We now infer the expected type at <> to be []int. We also support the variadicity of append(). Change-Id: Ie0ef0007907fcb7992f9697cb90970ce4d9a66b8 Reviewed-on: https://go-review.googlesource.com/c/tools/+/205606 Run-TryBot: Rebecca Stambler <rstambler@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Rebecca Stambler <rstambler@golang.org>
This commit is contained in:
parent
7d206e10da
commit
97ad0ed331
@ -1053,10 +1053,8 @@ type typeNameInference struct {
|
||||
|
||||
// expectedType returns information about the expected type for an expression at
|
||||
// the query position.
|
||||
func expectedType(c *completer) typeInference {
|
||||
inf := typeInference{
|
||||
typeName: expectTypeName(c),
|
||||
}
|
||||
func expectedType(c *completer) (inf typeInference) {
|
||||
inf.typeName = expectTypeName(c)
|
||||
|
||||
if c.enclosingCompositeLiteral != nil {
|
||||
inf.objType = c.expectedCompositeLiteralType()
|
||||
@ -1139,6 +1137,39 @@ Nodes:
|
||||
break Nodes
|
||||
}
|
||||
}
|
||||
|
||||
if funIdent, ok := node.Fun.(*ast.Ident); ok {
|
||||
switch c.pkg.GetTypesInfo().ObjectOf(funIdent) {
|
||||
case types.Universe.Lookup("append"):
|
||||
defer func() {
|
||||
exprIdx := indexExprAtPos(c.pos, node.Args)
|
||||
|
||||
// Check if we are completing the variadic append()
|
||||
// param. We defer this since we don't want to inherit
|
||||
// variadicity from the next node.
|
||||
inf.variadic = exprIdx == 1 && len(node.Args) <= 2
|
||||
|
||||
// If we are completing an individual element of the
|
||||
// variadic param, "deslice" the expected type.
|
||||
if !inf.variadic && exprIdx > 0 {
|
||||
if slice, ok := inf.objType.(*types.Slice); ok {
|
||||
inf.objType = slice.Elem()
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
// The expected type of append() arguments is the expected
|
||||
// type of the append() call itself. For example:
|
||||
//
|
||||
// var foo []int
|
||||
// foo = append(<>)
|
||||
//
|
||||
// To find the expected type at <> we "skip" the append()
|
||||
// node and get the expected type one level up, which is
|
||||
// []int.
|
||||
continue Nodes
|
||||
}
|
||||
}
|
||||
}
|
||||
return inf
|
||||
case *ast.ReturnStmt:
|
||||
|
19
internal/lsp/testdata/append/append.go
vendored
Normal file
19
internal/lsp/testdata/append/append.go
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
package append
|
||||
|
||||
func foo([]string) {}
|
||||
func bar(...string) {}
|
||||
|
||||
func _() {
|
||||
var (
|
||||
aInt []int //@item(appendInt, "aInt", "[]int", "var")
|
||||
aStrings []string //@item(appendStrings, "aStrings", "[]string", "var")
|
||||
aString string //@item(appendString, "aString", "string", "var")
|
||||
)
|
||||
|
||||
foo(append()) //@rank("))", appendStrings, appendInt),rank("))", appendStrings, appendString)
|
||||
foo(append(nil, a)) //@rank("))", appendStrings, appendInt),rank("))", appendString, appendInt),snippet("))", appendStrings, "aStrings...", "aStrings...")
|
||||
foo(append(nil, "", a)) //@rank("))", appendString, appendInt),rank("))", appendString, appendStrings)
|
||||
|
||||
// Don't add "..." to append() argument.
|
||||
bar(append()) //@snippet("))", appendStrings, "aStrings", "aStrings")
|
||||
}
|
4
internal/lsp/testdata/summary.txt.golden
vendored
4
internal/lsp/testdata/summary.txt.golden
vendored
@ -1,10 +1,10 @@
|
||||
-- summary --
|
||||
CompletionsCount = 215
|
||||
CompletionSnippetCount = 45
|
||||
CompletionSnippetCount = 47
|
||||
UnimportedCompletionsCount = 3
|
||||
DeepCompletionsCount = 5
|
||||
FuzzyCompletionsCount = 7
|
||||
RankedCompletionsCount = 16
|
||||
RankedCompletionsCount = 22
|
||||
CaseSensitiveCompletionsCount = 4
|
||||
DiagnosticsCount = 22
|
||||
FoldingRangesCount = 2
|
||||
|
Loading…
Reference in New Issue
Block a user