many tests and fixes for instance element renamings

jedi/api.py

@@ -327,7 +327,7 @@ class Script(object):
                     and self.pos < user_stmt.get_assignment_calls().start_pos:
             # the search_name might be before `=`
             definitions = [v for v in user_stmt.set_vars
-                                                if unicode(v) == search_name]
+                                if unicode(v.names[-1]) == search_name]
         if not isinstance(user_stmt, parsing.Import):
             # import case is looked at with add_import_name option
             definitions = dynamic.related_name_add_import_modules(definitions,
@@ -341,7 +341,7 @@ class Script(object):
             if isinstance(d, parsing.Module):
                 names.append(api_classes.RelatedName(d, d))
             else:
-                names.append(api_classes.RelatedName(d.names[0], d))
+                names.append(api_classes.RelatedName(d.names[-1], d))
 
         return sorted(set(names), key=lambda x: (x.module_path, x.start_pos),
                                                                 reverse=True)

jedi/dynamic.py

@@ -349,12 +349,14 @@ class ArrayInstance(parsing.Base):
 
 
 def related_names(definitions, search_name, mods):
-    def strip_ambiguity(definitions):
+    def compare_array(definitions):
+        """ `definitions` are being compared by module/start_pos, because
+        sometimes the id's of the objects change (e.g. executions).
+        """
         result = []
         for d in definitions:
-            if isinstance(d, evaluate.InstanceElement):
-                d = d.var
-            result.append(d)
+            module = d.get_parent_until()
+            result.append((module, d.start_pos))
         return result
 
     def check_call(call):
@@ -369,11 +371,10 @@ def related_names(definitions, search_name, mods):
         for f in follow:
             follow_res, search = evaluate.goto(call.parent_stmt, f)
             follow_res = related_name_add_import_modules(follow_res, search)
-            follow_res = strip_ambiguity(follow_res)
 
-            #print follow_res, [d.parent for d in follow_res]
+            compare_follow_res = compare_array(follow_res)
             # compare to see if they match
-            if any(r in definitions for r in follow_res):
+            if any(r in compare_definitions for r in compare_follow_res):
                 scope = call.parent_stmt
                 result.append(api_classes.RelatedName(search, scope))
 
@@ -395,7 +396,7 @@ def related_names(definitions, search_name, mods):
         except AssertionError:
             return False
 
-    definitions = strip_ambiguity(definitions)
+    compare_definitions = compare_array(definitions)
     mods |= set([d.get_parent_until() for d in definitions])
     names = []
     for m in get_directory_modules_for_name(mods, search_name):