SourceCode
diff --git a/‎libs/codeintel2/constants_css3.py‎
Lines changed: 190 additions & 159 deletions b/‎libs/codeintel2/constants_css3.py‎
Lines changed: 190 additions & 159 deletions
diff --git a/‎libs/codeintel2/database/database.py‎
Lines changed: 1 addition & 1 deletion b/‎libs/codeintel2/database/database.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎libs/codeintel2/database/langlib.py‎
Lines changed: 33 additions & 0 deletions b/‎libs/codeintel2/database/langlib.py‎
Lines changed: 33 additions & 0 deletions
diff --git a/‎libs/codeintel2/database/stdlib.py‎
Lines changed: 22 additions & 25 deletions b/‎libs/codeintel2/database/stdlib.py‎
Lines changed: 22 additions & 25 deletions
@@ -398,7 +398,7 @@ def __init__(self, mgr, base_dir=None, catalog_dirs=None,
         self.event_reporter = event_reporter
 
         if import_everything_langs is None:
-            self.import_everything_langs = set(["JavaScript", "Node.js", "PHP"])
+            self.import_everything_langs = set(["JavaScript", "PHP"])
         else:
             self.import_everything_langs = import_everything_langs
         assert isinstance(self.import_everything_langs, set)
 
@@ -180,6 +180,39 @@ def get_blob_imports(self, prefix):
         finally:
             self._release_lock()
 
+    def blobs_with_basename(self, basename, ctlr=None):
+        """Return all blobs that match the given base path.
+        
+        I.e. a filename lookup across all files in the dirs of this lib.
+
+            "basename" is a string, e.g. 'Http.js'
+            "ctlr" (optional) is an EvalController instance. If
+                specified it should be used in the normal way (logging,
+                checking .is_aborted()).
+
+        A "blob" is a global scope-tag hit in all of the blobs for the execution
+        set buffers.
+
+        Returns the empty list if no hits.
+        """
+        blobs = []
+        # we can't use self.get_blob because that only returns one answer; we
+        # we need all of them.
+
+        self._acquire_lock()
+        try:
+            for dir in self.dirs:
+                self.ensure_dir_scanned(dir)
+                dbfile_from_blobname = self.lang_zone.dfb_from_dir(dir, {})
+                blobbase = dbfile_from_blobname.get(basename)
+                if blobbase is not None:
+                    dhash = self.lang_zone.dhash_from_dir(dir)
+                    dbsubpath = join(dhash, blobbase)
+                    blobs.append(self.lang_zone.load_blob(dbsubpath))
+        finally:
+            self._release_lock()
+        return blobs
+
     def hits_from_lpath(self, lpath, ctlr=None, curr_buf=None):
         """Return all hits of the given lookup path.
         
 
@@ -576,39 +576,36 @@ def _add_res(self, res, lang, name, ver):
         LEN_PREFIX = self.db.LEN_PREFIX
         is_hits_from_lpath_lang = lang in self.db.import_everything_langs
         blob_index = {} # {blobname -> dbfile}
-        if is_hits_from_lpath_lang:
-            toplevelname_index = {} # {ilk -> toplevelname -> blobnames}
-            toplevelprefix_index = {} # {ilk -> prefix -> toplevelnames}
+        toplevelname_index = {} # {ilk -> toplevelname -> blobnames}
+        toplevelprefix_index = {} # {ilk -> prefix -> toplevelnames}
         for blob in tree.findall("file/scope"):
             assert lang == blob.get("lang")
             blobname = blob.get("name")
             dbfile = self.db.bhash_from_blob_info(cix_path, lang, blobname)
             blob_index[blobname] = dbfile
             ET.ElementTree(blob).write(join(dbdir, dbfile+".blob"))
-            if is_hits_from_lpath_lang:
-                for toplevelname, elem in blob.names.iteritems():
-                    if "__local__" in elem.get("attributes", "").split():
-                        # this is internal to the stdlib
-                        continue
-                    ilk = elem.get("ilk") or elem.tag
-                    bft = toplevelname_index.setdefault(ilk, {})
-                    if toplevelname not in bft:
-                        bft[toplevelname] = set([blobname])
-                    else:
-                        bft[toplevelname].add(blobname)
-                    prefix = toplevelname[:LEN_PREFIX]
-                    tfp = toplevelprefix_index.setdefault(ilk, {})
-                    if prefix not in tfp:
-                        tfp[prefix] = set([toplevelname])
-                    else:
-                        tfp[prefix].add(toplevelname)
+            for toplevelname, elem in blob.names.iteritems():
+                if "__local__" in elem.get("attributes", "").split():
+                    # this is internal to the stdlib
+                    continue
+                ilk = elem.get("ilk") or elem.tag
+                bft = toplevelname_index.setdefault(ilk, {})
+                if toplevelname not in bft:
+                    bft[toplevelname] = set([blobname])
+                else:
+                    bft[toplevelname].add(blobname)
+                prefix = toplevelname[:LEN_PREFIX]
+                tfp = toplevelprefix_index.setdefault(ilk, {})
+                if prefix not in tfp:
+                    tfp[prefix] = set([toplevelname])
+                else:
+                    tfp[prefix].add(toplevelname)
 
         self.db.save_pickle(join(dbdir, "blob_index"), blob_index)
-        if is_hits_from_lpath_lang:
-            self.db.save_pickle(join(dbdir, "toplevelname_index"),
-                                toplevelname_index)
-            self.db.save_pickle(join(dbdir, "toplevelprefix_index"),
-                                toplevelprefix_index)
+        self.db.save_pickle(join(dbdir, "toplevelname_index"),
+                            toplevelname_index)
+        self.db.save_pickle(join(dbdir, "toplevelprefix_index"),
+                            toplevelprefix_index)
 
         mtime = os.stat(cix_path).st_mtime
         self.res_index[res.area_path] = mtime