Allow selection of catalogs for languages

Kronuz · Kronuz · commit 6d1ce23cf223 · 2013-07-11T14:48:24.000-05:00
diff --git a/SublimeCodeIntel.py b/SublimeCodeIntel.py
@@ -547,7 +547,11 @@ def codeintel_scan(view, path, content, lang, callback=None, pos=None, forms=Non
     vid = view.id()
     folders = getattr(view.window(), 'folders', lambda: [])()  # FIXME: it's like this for backward compatibility (<= 2060)
     folders_id = str(hash(frozenset(folders)))
-    codeintel_config = view.settings().get('codeintel_config', {})
+    view_settings = view.settings()
+    codeintel_config = view_settings.get('codeintel_config', {})
+    _codeintel_max_recursive_dir_depth = view_settings.get('codeintel_max_recursive_dir_depth', 10)
+    _codeintel_scan_files_in_project = view_settings.get('codeintel_scan_files_in_project', True)
+    _codeintel_selected_catalogs = view_settings.get('codeintel_selected_catalogs', [])
 
     def _codeintel_scan():
         global despair, despaired
@@ -609,16 +613,30 @@ def _codeintel_scan():
                     codeintel_log.warning(msg)
                 valid = False
 
+            codeintel_config_lang = codeintel_config.get(lang, {})
+            codeintel_max_recursive_dir_depth = codeintel_config_lang.get('codeintel_max_recursive_dir_depth', _codeintel_max_recursive_dir_depth)
+            codeintel_scan_files_in_project = codeintel_config_lang.get('codeintel_scan_files_in_project', _codeintel_scan_files_in_project)
+            codeintel_selected_catalogs = codeintel_config_lang.get('codeintel_selected_catalogs', _codeintel_selected_catalogs)
+
+            avail_catalogs = mgr.db.get_catalogs_zone().avail_catalogs()
+
             # Load configuration files:
-            for catalog in mgr.db.get_catalogs_zone().avail_catalogs():
+            all_catalogs = []
+            for catalog in avail_catalogs:
+                all_catalogs.append("%s (for %s: %s)" % (catalog['name'], catalog['lang'], catalog['description']))
                 if catalog['lang'] == lang:
-                    catalogs.append(catalog['name'])
+                    if catalog['name'] in codeintel_selected_catalogs:
+                        catalogs.append(catalog['name'])
+            msg = "Avaliable catalogs: %s" % ', '.join(all_catalogs) or None
+            log.debug(msg)
+            codeintel_log.debug(msg)
+
             config = {
-                "codeintel_selected_catalogs": catalogs,
-                "codeintel_max_recursive_dir_depth": 10,
-                "codeintel_scan_files_in_project": True,
+                'codeintel_max_recursive_dir_depth': codeintel_max_recursive_dir_depth,
+                'codeintel_scan_files_in_project': codeintel_scan_files_in_project,
+                'codeintel_selected_catalogs': catalogs,
             }
-            config.update(codeintel_config.get(lang, {}))
+            config.update(codeintel_config_lang)
 
             _config = {}
             try:
@@ -674,7 +692,10 @@ def _codeintel_scan():
                 msgs.append(('info', "\n%s\n%s" % (msg, "-" * len(msg))))
 
             if catalogs:
-                msgs.append(('info', "New env with catalogs for '%s': %s" % (lang, ', '.join(catalogs) or None)))
+                msg = "New env with catalogs for '%s': %s" % (lang, ', '.join(catalogs) or None)
+                log.debug(msg)
+                codeintel_log.warning(msg)
+                msgs.append(('info', msg))
 
             buf = mgr.buf_from_content(content.encode('utf-8'), lang, env, path or "<Unsaved>", 'utf-8')
 
@@ -875,6 +896,9 @@ def get_revision(path=None):
     'codeintel_disabled_languages',
     'codeintel_live',
     'codeintel_live_disabled_languages',
+    'codeintel_max_recursive_dir_depth',
+    'codeintel_scan_files_in_project',
+    'codeintel_selected_catalogs',
     'codeintel_syntax_map',
     'codeintel_scan_exclude_dir',
     'codeintel_config',
diff --git a/SublimeCodeIntel.sublime-settings b/SublimeCodeIntel.sublime-settings
@@ -57,6 +57,37 @@
         "JavaScript":["/build/", "/min/"]
     },
 
+    /* Code Scanning: Controls how the Code Intelligence system scans your source code files. */
+
+    /* Maximum directory depth: */
+    "codeintel_max_recursive_dir_depth": 10,
+
+    /* Include all files and directories from the project base directory: */
+    "codeintel_scan_files_in_project": true,
+
+    /* API Catalogs: SublimeCodeIntel uses API catalogs to provide autocomplete and calltips for 3rd-party libraies.
+       Add te libraries that you use in your code. Note: Adding all API catalogs for a particular language can lead to confusing results.
+
+       Avaliable catalogs:
+            PyWin32 (Python3) (for Python3: Python Extensions for Windows)
+            PyWin32 (for Python: Python Extensions for Windows)
+            Rails (for Ruby: Rails version 1.1.6)
+            jQuery (for JavaScript: jQuery JavaScript library - version 1.9.1)
+            Prototype (for JavaScript: JavaScript framework for web development)
+            dojo (for JavaScript: Dojo Toolkit API - version 1.5.0)
+            Ext_30 (for JavaScript: Ext JavaScript framework - version 3.0)
+            HTML5 (for JavaScript: HTML5 (Canvas, Web Messaging, Microdata))
+            MochiKit (for JavaScript: A lightweight JavaScript library - v1.4.2)
+            Mozilla Toolkit (for JavaScript: Mozilla Toolkit API - version 1.8)
+            XBL (for JavaScript: XBL JavaScript support - version 1.0)
+            YUI (for JavaScript: Yahoo! User Interface Library - v2.8.1)
+            Drupal (for PHP: A full-featured PHP content management/discussion engine -- v5.1)
+            PECL (for PHP: A collection of PHP Extensions)
+    */
+    "codeintel_selected_catalogs": [
+        "PyWin32", "jQuery", "Rails"
+    ],
+
     /*
         Defines a configuration for each language.
     */
