gopls/internal/lsp/source/completion: gopForEachPackageMember check ast.OverloadFuncDecl

Author: visualfc

gopls/internal/lsp/source/completion/completion_gox.go

@@ -1281,14 +1281,23 @@ func (c *gopCompleter) selector(ctx context.Context, sel *ast.SelectorExpr) erro
 				paramList("(", ")", fn.Type.Params)
 
 				item.snippet = &sn
+			} else if tok == token.FUNC {
+				// ast.OverloadFuncDecl
+				item.isOverload = true
+				item.Detail = "Go+ overload func\n\n" + item.Detail
 			}
 
 			cMu.Lock()
 			c.items = append(c.items, item)
 			// goxls func alias
 			if tok == token.FUNC {
 				if alias, ok := hasAliasName(id.Name); ok {
-					noSnip := len(fn.Type.Params.List) == 0
+					var noSnip bool
+					if fn != nil {
+						noSnip = len(fn.Type.Params.List) == 0
+					} else {
+						noSnip = true
+					}
 					c.items = append(c.items, cloneAliasItem(item, id.Name, alias, 0.0001, noSnip))
 				}
 			}
@@ -1333,45 +1342,7 @@ func (c *gopCompleter) selector(ctx context.Context, sel *ast.SelectorExpr) erro
 	if err := g.Wait(); err != nil {
 		return err
 	}
-	// check gop packages index overload
-	for pkg, items := range recheck.items {
-		if recheck.pkgs[pkg] {
-			names := make(map[string]bool)
-			sort.Slice(items, func(i, j int) bool {
-				return items[i].Label < items[j].Label
-			})
-			for _, item := range items {
-				id := item.Label[:len(item.Label)-3]
-				if !names[id] {
-					names[id] = true
-					item.isOverload = true
-					c.items = append(c.items, cloneAliasItem(item.CompletionItem, item.Label, id, 0, false))
-					if alias, ok := hasAliasName(id); ok {
-						c.items = append(c.items, cloneAliasItem(item.CompletionItem, item.Label, alias, 0.0001, item.noSnip))
-					}
-				}
-			}
-		} else {
-			for _, item := range items {
-				c.items = append(c.items, item.CompletionItem)
-				if alias, ok := hasAliasName(item.Label); ok {
-					c.items = append(c.items, cloneAliasItem(item.CompletionItem, item.Label, alias, 0.0001, item.noSnip))
-				}
-			}
-		}
-	}
-	// check gop packages gopo overload
-	for pkg, items := range recheck.gopo {
-		if recheck.pkgs[pkg] {
-			for _, item := range items {
-				c.items = append(c.items, item)
-				if alias, ok := hasAliasName(item.Label); ok {
-					c.items = append(c.items, cloneAliasItem(item, item.Label, alias, 0.0001, true))
-				}
-			}
-		}
-	}
-
+	recheck.checkOverload(c)
 	// In addition, we search in the module cache using goimports.
 	ctx, cancel := context.WithCancel(ctx)
 	var mu sync.Mutex
@@ -1413,12 +1384,6 @@ type recheckItem struct {
 	noSnip bool
 }
 
-type unimportChecked struct {
-	pkgs  map[source.PackagePath]bool             // gop package
-	items map[source.PackagePath][]recheckItem    // index overload funcs
-	gopo  map[source.PackagePath][]CompletionItem // gopo overload funcs
-}
-
 func (c *gopCompleter) packageMembers(pkg *types.Package, score float64, imp *importInfo, cb func(candidate)) {
 	scope := pkg.Scope()
 	for _, name := range scope.Names() {
@@ -2498,6 +2463,58 @@ func gopForEachPackageMember(content []byte, f func(tok token.Token, id *ast.Ide
 			if decl.Recv == nil {
 				f(token.FUNC, decl.Name, decl)
 			}
+		case *ast.OverloadFuncDecl:
+			if decl.Recv == nil {
+				f(token.FUNC, decl.Name, nil)
+			}
+		}
+	}
+}
+
+type unimportChecked struct {
+	pkgs  map[source.PackagePath]bool             // gop package
+	items map[source.PackagePath][]recheckItem    // index overload funcs
+	gopo  map[source.PackagePath][]CompletionItem // gopo overload funcs
+}
+
+func (recheck *unimportChecked) checkOverload(c *gopCompleter) {
+	// check gop package index overload
+	for pkg, items := range recheck.items {
+		if recheck.pkgs[pkg] {
+			names := make(map[string]bool)
+			sort.Slice(items, func(i, j int) bool {
+				return items[i].Label < items[j].Label
+			})
+			for _, item := range items {
+				id := item.Label[:len(item.Label)-3]
+				if !names[id] {
+					names[id] = true
+					item.isOverload = true
+					item.Detail = "Go+ overload func\n\n" + item.Detail
+					c.items = append(c.items, cloneAliasItem(item.CompletionItem, item.Label, id, 0, false))
+					if alias, ok := hasAliasName(id); ok {
+						c.items = append(c.items, cloneAliasItem(item.CompletionItem, item.Label, alias, 0.0001, item.noSnip))
+					}
+				}
+			}
+		} else {
+			for _, item := range items {
+				c.items = append(c.items, item.CompletionItem)
+				if alias, ok := hasAliasName(item.Label); ok {
+					c.items = append(c.items, cloneAliasItem(item.CompletionItem, item.Label, alias, 0.0001, item.noSnip))
+				}
+			}
+		}
+	}
+	// check gop package gopo overload
+	for pkg, items := range recheck.gopo {
+		if recheck.pkgs[pkg] {
+			for _, item := range items {
+				c.items = append(c.items, item)
+				if alias, ok := hasAliasName(item.Label); ok {
+					c.items = append(c.items, cloneAliasItem(item, item.Label, alias, 0.0001, true))
+				}
+			}
 		}
 	}
 }

gopls/internal/lsp/source/completion/format_gox.go

@@ -142,7 +142,7 @@ Suffixes:
 				if _, objs := gogen.CheckSigFuncExObjects(sig); len(objs) > 0 {
 					isOverload = true
 					var buf bytes.Buffer
-					buf.WriteString("Go+ overload funcs\n")
+					buf.WriteString("Go+ overload func\n")
 					for _, o := range objs {
 						if isIndexOverload(o.Name(), obj.Name()) {
 							c.seen[o] = true