Don't rename import alias equal to moved pkg

Author: katexochen

internal/mvpkg/mvpkg.go

@@ -198,7 +198,7 @@ func (p *pkgMover) fixImportsInFile(fset *token.FileSet, src, dst, filename stri
 
 	ast.SortImports(fset, astFile)
 
-	newFile := astutil.Apply(astFile, func(c *astutil.Cursor) bool {
+	applyFunc := func(c *astutil.Cursor) bool {
 		selExpr, ok := c.Node().(*ast.SelectorExpr)
 		if !ok {
 			return true
@@ -221,7 +221,15 @@ func (p *pkgMover) fixImportsInFile(fset *token.FileSet, src, dst, filename stri
 		}
 
 		return true
-	}, nil)
+	}
+
+	if isImportAliased(astFile, dstPkgPath) {
+		// if the import of the package we are moving has an import alias,
+		// we don't need to rename identifiers in the file.
+		applyFunc = nil
+	}
+
+	newFile := astutil.Apply(astFile, applyFunc, nil)
 
 	var buf bytes.Buffer
 
@@ -243,6 +251,21 @@ func (p *pkgMover) fixImportsInFile(fset *token.FileSet, src, dst, filename stri
 	return nil
 }
 
+// isImportAliased returns true if the import with the given path has an import alias in the given file.
+func isImportAliased(file *ast.File, path string) bool {
+	for _, imp := range file.Imports {
+		if imp.Path == nil {
+			continue
+		}
+
+		if imp.Path.Value == fmt.Sprintf("%q", path) {
+			return imp.Name != nil
+		}
+	}
+
+	return false
+}
+
 func (p *pkgMover) getPkgPath(path string) string {
 	newPath, ok := p.alreadyMovedPkgs[path]
 	if ok {
@@ -252,7 +275,7 @@ func (p *pkgMover) getPkgPath(path string) string {
 	return path
 }
 
-// getFilePath is meant to be used on files (not directories) with file paths relvative to the root of the module.
+// getFilePath is meant to be used on files (not directories) with file paths relative to the root of the module.
 func (p *pkgMover) getFilePath(filePath string) string {
 	newPath, ok := p.alreadyMovedFiles[filePath]
 	if ok {

internal/mvpkg/tests/03_pkg_alias/README.md

@@ -0,0 +1,6 @@
+# Package alias
+
+This tests moves and renames a package that is imported under a package alias by another package.
+The test ensures we don't rename identifiers that equal the package we're moving, but are alias.
+
+We move ./source/target to ./destination/targetnew.

internal/mvpkg/tests/03_pkg_alias/expected/destination/targetnew/target.go

@@ -0,0 +1,3 @@
+package targetnew
+
+func Foo() {}

internal/mvpkg/tests/03_pkg_alias/expected/go.mod

@@ -0,0 +1,3 @@
+module example.com
+
+go 1.13

internal/mvpkg/tests/03_pkg_alias/expected/source/depender/depender.go

@@ -0,0 +1,9 @@
+package depender
+
+import (
+	target "example.com/destination/targetnew"
+)
+
+func Bar() {
+	target.Foo()
+}

internal/mvpkg/tests/03_pkg_alias/expected/source/target/.gitkeep

@@ -0,0 +1,3 @@
+module example.com
+
+go 1.13

internal/mvpkg/tests/03_pkg_alias/original/go.mod

@@ -0,0 +1,9 @@
+package depender
+
+import (
+	target "example.com/source/target"
+)
+
+func Bar() {
+	target.Foo()
+}

internal/mvpkg/tests/03_pkg_alias/original/source/depender/depender.go

@@ -0,0 +1,3 @@
+package target
+
+func Foo() {}