Don't alias imports if the alias would be ineffective

Fixes stuff like `context "context"` and `http "net/http"`.

Signed-off-by: Brad Davidson <[email protected]>

Author: brandond

v2/generator/import_tracker.go

@@ -17,6 +17,7 @@ limitations under the License.
 package generator
 
 import (
+	"fmt"
 	"go/token"
 	"path/filepath"
 	"strings"
@@ -47,7 +48,14 @@ func NewImportTrackerForPackage(local string, typesToAdd ...*types.Type) *namer.
 	tracker := namer.NewDefaultImportTracker(types.Name{Package: local})
 	tracker.IsInvalidType = func(*types.Type) bool { return false }
 	tracker.LocalName = func(name types.Name) string { return goTrackerLocalName(&tracker, local, name) }
-	tracker.PrintImport = func(path, name string) string { return name + " \"" + path + "\"" }
+	tracker.PrintImport = func(path, name string) string {
+		fmt.Printf("%s imported as %s\n", path, name)
+		dirs := strings.Split(path, namer.GoSeperator)
+		if len(dirs) > 0 && name == dirs[len(dirs)-1] {
+			return "\"" + path + "\""
+		}
+		return name + " \"" + path + "\""
+	}
 
 	tracker.AddTypes(typesToAdd...)
 	return &tracker

v2/generator/import_tracker_test.go

@@ -38,10 +38,14 @@ func TestNewImportTracker(t *testing.T) {
 		{
 			name: "builtin",
 			inputTypes: []*types.Type{
+				{Name: types.Name{Package: "context"}},
 				{Name: types.Name{Package: "net/http"}},
+				{Name: types.Name{Package: "x/net/http"}},
 			},
 			expectedImports: []string{
-				`http "net/http"`,
+				`"context"`,
+				`"net/http"`,
+				`nethttp "x/net/http"`,
 			},
 		},
 		{
@@ -51,8 +55,21 @@ func TestNewImportTracker(t *testing.T) {
 				{Name: types.Name{Package: "foo/bar/pkg1"}},
 			},
 			expectedImports: []string{
-				`pkg1 "foo/bar/pkg1"`,
-				`pkg2 "foo/bar/pkg2"`,
+				`"foo/bar/pkg1"`,
+				`"foo/bar/pkg2"`,
+			},
+		},
+		{
+			name: "duplicate",
+			inputTypes: []*types.Type{
+				{Name: types.Name{Package: "foo/bar/pkg2/v1"}},
+				{Name: types.Name{Package: "foo/bar/pkg3/v1"}},
+				{Name: types.Name{Package: "foo/bar/pkg1/v1"}},
+			},
+			expectedImports: []string{
+				`pkg1v1 "foo/bar/pkg1/v1"`,
+				`"foo/bar/pkg2/v1"`,
+				`pkg3v1 "foo/bar/pkg3/v1"`,
 			},
 		},
 		{