Fixed updates of qualified references to modules in move module refactoring (PY-6466)

python/src/com/jetbrains/python/refactoring/move/PyMoveFileHandler.java

@@ -85,9 +85,14 @@ public class PyMoveFileHandler extends MoveFileHandler {
           }
           else if (element instanceof PyReferenceExpression) {
             updatedFiles.add(file);
-            final PyQualifiedName newElementName = PyQualifiedName.fromComponents(PyClassRefactoringUtil.getOriginalName(newElement));
-            replaceWithQualifiedExpression(element, newElementName);
-            PyClassRefactoringUtil.insertImport(element, newElement, null);
+            if (((PyReferenceExpression)element).getQualifier() != null) {
+              final PyQualifiedName newQualifiedName = ResolveImportUtil.findCanonicalImportPath(newElement, element);
+              replaceWithQualifiedExpression(element, newQualifiedName);
+            } else {
+              final PyQualifiedName newName = PyQualifiedName.fromComponents(PyClassRefactoringUtil.getOriginalName(newElement));
+              replaceWithQualifiedExpression(element, newName);
+              PyClassRefactoringUtil.insertImport(element, newElement, null);
+            }
           }
         }
       }

python/testData/refactoring/move/module/after/src/a.py

@@ -1,7 +1,9 @@
 from p1 import m1
 from p1.m1 import foo
+import p1.m1
+import p1
 
-m1.foo
+p1.m1.foo
 m1.bar
 m1
 foo

python/testData/refactoring/move/moduleToNonPackage/after/src/a.py

@@ -1,7 +1,8 @@
 from nonp3 import m1
 from nonp3.m1 import foo
+import nonp3.m1
 
-m1.foo
+nonp3.m1.foo
 m1.bar
 m1
 foo