Version bump v2.0.0-beta.13

+ Added missing (esprima) dependency.

Author: Kronuz

codeintel/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.0-beta.12'
+__version__ = '2.0.0-beta.13'

codeintel/codeintel2/tree_python.py

@@ -502,14 +502,8 @@ def _hit_from_first_part(self, tokens, scoperef):
             scoperef = (self.built_in_blob, [])
             return (self.built_in_blob, scoperef), 1
 
-        elem = self._elem_from_scoperef(scoperef)
-        if first_token == elem.get("name"):
-            # The element itself is the thing we wanted...
-            self.log("is '%s' accessible on %s? yes: %s",
-                     first_token, scoperef, elem)
-            return (elem, scoperef), 1
-
         while 1:
+            elem = self._elem_from_scoperef(scoperef)
             if first_token in elem.names:
                 #TODO: skip __hidden__ names
                 self.log("is '%s' accessible on %s? yes: %s",
@@ -523,11 +517,16 @@ def _hit_from_first_part(self, tokens, scoperef):
                          '.'.join(tokens[:nconsumed]), scoperef, hit[0])
                 return hit, nconsumed
 
+            if first_token == elem.get("name"):
+                # The element itself is the thing we wanted...
+                self.log("is '%s' accessible on %s? yes: %s",
+                         first_token, scoperef, elem)
+                return (elem, scoperef), 1
+
             self.log("is '%s' accessible on %s? no", first_token, scoperef)
             scoperef = self.parent_scoperef_from_scoperef(scoperef)
             if not scoperef:
                 return None, None
-            elem = self._elem_from_scoperef(scoperef)
 
     def _set_reldirlib_from_blob(self, blob):
         """Set the relative import directory to be this blob's location."""

setup.py

@@ -209,6 +209,7 @@
     'applib',
     'chardet',
     'cmdln',
+    'esprima',
     'inflector',
     'six',
     'zope.cachedescriptors',