Usages are pretty solid now except for parser issues.

jedi/api/__init__.py

@@ -445,9 +445,16 @@ class Script(object):
         if stmt is None:
             return []
 
-        last_name = stmt
-        while not isinstance(last_name, pr.Name):
-            last_name = last_name.children[-1]
+        if user_stmt is None:
+            last_name = None
+        else:
+            # Try to use the parser if possible.
+            last_name = user_stmt.name_for_position(self._pos)
+
+        if last_name is None:
+            last_name = stmt
+            while not isinstance(last_name, pr.Name):
+                last_name = last_name.children[-1]
 
         if next(context) in ('class', 'def'):
             # The cursor is on a class/function name.

jedi/api/usages.py

@@ -68,7 +68,7 @@ def usages(evaluator, definition_names, mods):
         for name in check_names:
 
             result = evaluator.goto(name)
-            if [c in compare_definitions for c in compare_array(result)]:
+            if [c for c in compare_array(result) if c in compare_definitions]:
                 definitions.append(classes.Definition(evaluator, name))
 
             continue  # TODO DELETE