Version bump to v2.0.0-beta.33

+ ECMAScript: Fix imports
+ ECMAScript: constructor() is non-static

Author: Kronuz

codeintel/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.0-beta.32'
+__version__ = '2.0.0-beta.33'

codeintel/codeintel2/ecmacile.py

@@ -1155,7 +1155,6 @@ def _visitFunction(self, node, extra_attributes=[]):
         # attributes.append("protected")
         if name == "constructor" and parentIsClass:
             attributes.append("__ctor__")
-            attributes.append("__staticmethod__")
 
         # process decorators
         if node.static:

codeintel/codeintel2/lang_ecma.py

@@ -1198,6 +1198,8 @@ def _find_importable(self, imp_dir, name, boost, find_package=True):
                 else:
                     while main.startswith('./'):
                         main = main[2:]
+                    main_dir = os.path.dirname(main)
+                    main_base = os.path.join(main_dir, os.path.basename(main).partition('.')[0])
                     for subpath in self.subpaths:
                         _name = os.path.join(name, self.subpaths_re.sub(r'\1%s\2' % subpath, main))
                         if os.path.exists(os.path.join(imp_dir, dirname(_name))):
@@ -1207,6 +1209,22 @@ def _find_importable(self, imp_dir, name, boost, find_package=True):
                                 module = (module[0], name, module[2])
                                 return module
 
+                        _name = os.path.join(name, self.subpaths_re.sub(r'\1%s\2' % subpath, main_base))
+                        if os.path.exists(os.path.join(imp_dir, dirname(_name))):
+                            module = self._find_importable(imp_dir, _name, boost // 2, find_package=False)
+                            if module:
+                                # Remove subpath from module name
+                                module = (module[0], name, module[2])
+                                return module
+
+                        _name = os.path.join(name, self.subpaths_re.sub(r'\1%s\2' % subpath, main_dir))
+                        if os.path.exists(os.path.join(imp_dir, dirname(_name))):
+                            module = self._find_importable(imp_dir, _name, boost // 2, find_package=False)
+                            if module:
+                                # Remove subpath from module name
+                                module = (module[0], name, module[2])
+                                return module
+
             if not suffix:
                 for _suffix in suffixes:
                     _name = dirname(name)
@@ -1221,7 +1239,8 @@ def _find_importable(self, imp_dir, name, boost, find_package=True):
                     return (suffixes_dict[_suffix] + boost, name, (init, 'index', False))
 
             if suffix in suffixes:
-                return (suffixes_dict[suffix] + boost, mod, (name, basename(mod), False))
+                if os.path.exists(os.path.join(imp_dir, name)):
+                    return (suffixes_dict[suffix] + boost, mod, (name, basename(mod), False))
 
     def find_importables_in_dir(self, imp_dir):
         """See citadel.py::ImportHandler.find_importables_in_dir() for