Get renames working for module imports

jedi/api/refactoring.py

@@ -1,3 +1,5 @@
+from os.path import dirname, basename, join
+import re
 import difflib
 
 from parso import split_lines
@@ -54,36 +56,44 @@ class Refactoring(object):
 
         Returns ``Iterable[Tuple[str, str]]``.
         """
-        return self._renames
+        return sorted(self._renames)
 
     def get_diff(self):
-        return ''.join(f.get_diff() for f in self.get_changed_files())
+        text = ''
+        for from_, to in self.get_renames():
+            text += 'rename from %s\nrename to %s\n' % (from_, to)
+
+        return text + ''.join(f.get_diff() for f in self.get_changed_files())
 
     def apply(self):
-        for old, new in self._renames:
+        for old, new in self.get_renames():
             rename(old, new)
 
         for f in self.get_changed_files():
             f.apply()
 
 
-def _rename_path(path, new_name):
-    pass
+def _calculate_rename(path, new_name):
+    name = basename(path)
+    dir_ = dirname(path)
+    if name in ('__init__.py', '__init__.pyi'):
+        parent_dir = dirname(dir_)
+        return dir_, join(parent_dir, new_name, name)
+    ending = re.search(r'\.pyi?$', name).group(0)
+    return path, join(dir_, new_name + ending)
 
 
 def rename(grammar, definitions, new_name):
-    file_renames = []
+    file_renames = set()
     file_tree_name_map = {}
 
     for d in definitions:
-        if d.type == 'module':
-            file_renames.append(
-                (d.module_path, _rename_path(d.module_path, new_name))
-            )
+        tree_name = d._name.tree_name
+        if d.type == 'module' and tree_name is None:
+            file_renames.add(_calculate_rename(d.module_path, new_name))
         else:
             # This private access is ok in a way. It's not public to
             # protect Jedi users from seeing it.
-            tree_name = d._name.tree_name
             if tree_name is not None:
                 fmap = file_tree_name_map.setdefault(d.module_path, {})
                 fmap[tree_name] = tree_name.prefix + new_name