Stop renaming fields

Author: katexochen

internal/mvpkg/mvpkg.go

@@ -199,12 +199,25 @@ func (p *pkgMover) fixImportsInFile(fset *token.FileSet, src, dst, filename stri
 	ast.SortImports(fset, astFile)
 
 	newFile := astutil.Apply(astFile, func(c *astutil.Cursor) bool {
-		n, ok := c.Node().(*ast.Ident)
-		if ok && n.Name == renameFrom && n.Obj == nil {
-			c.Replace(&ast.Ident{
-				NamePos: n.NamePos,
-				Name:    renameTo,
-			})
+		selExpr, ok := c.Node().(*ast.SelectorExpr)
+		if !ok {
+			return true
+		}
+
+		ident, ok := selExpr.X.(*ast.Ident)
+		if !ok {
+			return true
+		}
+
+		if ident.Name == renameFrom && ident.Obj == nil {
+			c.Replace(
+				&ast.SelectorExpr{
+					Sel: selExpr.Sel,
+					X: &ast.Ident{
+						NamePos: selExpr.Sel.NamePos,
+						Name:    renameTo,
+					},
+				})
 		}
 
 		return true

internal/mvpkg/tests/01_trivial/testInfo.json

@@ -3,4 +3,4 @@
     "source": "./source/target",
     "destination": "./destination/target",
     "build_flags": []
-}
+}

internal/mvpkg/tests/02_issue_46/expected/destination/target/target.go

@@ -0,0 +1,5 @@
+package target
+
+type Foo struct{}
+
+func (f Foo) Hello() {}

internal/mvpkg/tests/02_issue_46/expected/go.mod

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

internal/mvpkg/tests/02_issue_46/expected/source/depender/depender.go

@@ -0,0 +1,12 @@
+package depender
+
+import "example.com/destination/target"
+
+type Bar struct {
+	target target.Foo
+}
+
+func (b *Bar) Foo() target.Foo {
+	b.target.Hello()
+	return target.Foo{}
+}

internal/mvpkg/tests/02_issue_46/expected/source/target/.gitkeep

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

internal/mvpkg/tests/02_issue_46/original/go.mod

@@ -0,0 +1,12 @@
+package depender
+
+import "example.com/source/target"
+
+type Bar struct {
+	target target.Foo
+}
+
+func (b *Bar) Foo() target.Foo {
+	b.target.Hello()
+	return target.Foo{}
+}

internal/mvpkg/tests/02_issue_46/original/source/depender/depender.go

@@ -0,0 +1,5 @@
+package target
+
+type Foo struct{}
+
+func (f Foo) Hello() {}