Improve api class tests.

jedi/evaluate/__init__.py

@@ -488,6 +488,8 @@ class Evaluator(object):
             # a name it's something you can "goto" again.
             return [TreeNameDefinition(context, name)]
         elif isinstance(par, (tree.Param, tree.Function, tree.Class)) and par.name is name:
+            if par.type in ('funcdef', 'classdef', 'module'):
+                return [context.name]
             return [TreeNameDefinition(context, name)]
         elif isinstance(stmt, tree.Import):
             module_names = imports.ImportWrapper(context, name).follow(is_goto=True)

jedi/evaluate/compiled/__init__.py

@@ -305,10 +305,6 @@ class CompiledContextName(AbstractNameDefinition):
         self.string_name = name
         self.parent_context = parent_context
 
-    @property
-    def api_type(self):
-        return self.parent_context.api_type
-
     def infer(self):
         return [self.parent_context]
 

jedi/evaluate/filters.py

@@ -13,14 +13,13 @@ class AbstractNameDefinition(object):
     start_pos = None
     string_name = None
     parent_context = None
+    tree_name = None
 
     @abstractmethod
     def infer(self):
         raise NotImplementedError
 
     def get_root_context(self):
-        if self.parent_context is None:
-            return self
         return self.parent_context.get_root_context()
 
     def __repr__(self):
@@ -34,8 +33,12 @@ class AbstractNameDefinition(object):
     def execute_evaluated(self, *args, **kwargs):
         return unite(context.execute_evaluated(*args, **kwargs) for context in self.infer())
 
+    @property
+    def api_type(self):
+        return self.parent_context.api_type
 
-class ContextName(AbstractNameDefinition):
+
+class AbstractTreeName(AbstractNameDefinition):
     def __init__(self, parent_context, tree_name):
         self.parent_context = parent_context
         self.tree_name = tree_name
@@ -48,15 +51,26 @@ class ContextName(AbstractNameDefinition):
     def start_pos(self):
         return self.tree_name.start_pos
 
+
+class ContextName(AbstractTreeName):
+    def __init__(self, context, tree_name):
+        super(ContextName, self).__init__(context.parent_context, tree_name)
+        self._context = context
+
     def infer(self):
-        return [self.parent_context]
+        return [self._context]
+
+    def get_root_context(self):
+        if self.parent_context is None:
+            return self._context
+        return super(ContextName, self).get_root_context()
 
     @property
     def api_type(self):
-        return self.parent_context.api_type
+        return self._context.api_type
 
 
-class TreeNameDefinition(ContextName):
+class TreeNameDefinition(AbstractTreeName):
     def get_parent_flow_context(self):
         return self.parent_context
 
@@ -77,7 +91,7 @@ class TreeNameDefinition(ContextName):
         ).get(definition.type, 'statement')
 
 
-class ParamName(ContextName):
+class ParamName(AbstractTreeName):
     api_type = 'param'
 
     def __init__(self, parent_context, tree_name):

jedi/evaluate/imports.py

@@ -166,7 +166,6 @@ def get_init_path(directory_path):
 
 
 class ImportName(AbstractNameDefinition):
-    api_type = 'module'
     start_pos = (1, 0)
 
     def __init__(self, parent_module, string_name):
@@ -188,6 +187,9 @@ class ImportName(AbstractNameDefinition):
     def parent_context(self):
         return self.parent_module
 
+    @property
+    def api_type(self):
+        return 'module'
 
 class SubModuleName(ImportName):
     def infer(self):