From 316d2f2484791f06ed48e3d02847a48a585c2970 Mon Sep 17 00:00:00 2001 From: Heschi Kreinick Date: Fri, 3 Jan 2020 18:46:37 -0500 Subject: [PATCH] internal/lsp/source: only add names to imports when necessary As usual, I forgot to clear out the import spec's name when it matches the import path. Change-Id: I4ddd49b70e0db95fcd30d2968b098327fac39a92 Reviewed-on: https://go-review.googlesource.com/c/tools/+/213222 Run-TryBot: Heschi Kreinick Reviewed-by: Muir Manders Reviewed-by: zikaeroh Reviewed-by: Rebecca Stambler TryBot-Result: Gobot Gobot --- internal/lsp/source/completion.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/lsp/source/completion.go b/internal/lsp/source/completion.go index 4aff81bf0b..9964e0ac38 100644 --- a/internal/lsp/source/completion.go +++ b/internal/lsp/source/completion.go @@ -646,11 +646,14 @@ func (c *completer) unimportedMembers(id *ast.Ident) error { } // We don't know what this is, so assign it the highest score. score := 0.01 * imports.MaxRelevance - c.packageMembers(pkg.GetTypes(), score, &importInfo{ + imp := &importInfo{ importPath: path, - name: pkg.GetTypes().Name(), pkg: pkg, - }) + } + if imports.ImportPathToAssumedName(path) != pkg.GetTypes().Name() { + imp.name = pkg.GetTypes().Name() + } + c.packageMembers(pkg.GetTypes(), score, imp) if len(c.items) >= unimportedTarget { return nil }