Added relative paths and Updated documentation

Kronuz · Kronuz · commit 5de135f24e82 · 2011-05-31T07:16:02.000-05:00
diff --git a/.codeintel/config b/.codeintel/config
@@ -0,0 +1,6 @@
+{
+    "Python": {
+        "pythonExtraPaths": [ "./libs/" ]
+    }
+}
+
diff --git a/README.markdown b/README.markdown
@@ -44,33 +44,33 @@ Don't forget to add key or mouse bindings. For "Jump to Symbol Declaration":
         `{ "button": "button1", "modifiers": ["super"], "command": "goto_python_definition", "press_command": "drag_select" }`
 
 
-Configuration files (`~/.codeintel/config' or `project_root/.codeintel/config'). Example::
+Configuration files (`~/.codeintel/config' or `project_root/.codeintel/config'). All configurations are optional. Example::
 
     {
         "PHP": {
             "php": '/usr/bin/php',
             "phpExtraPaths": [],
-            "phpConfigFile": 'php.ini',
+            "phpConfigFile": 'php.ini'
         },
         "JavaScript": {
-            "javascriptExtraPaths": [],
+            "javascriptExtraPaths": []
         },
         "Perl": {
             "perl": "/usr/bin/perl",
-            "perlExtraPaths": [],
+            "perlExtraPaths": []
         },
         "Perl": {
             "ruby": "/usr/bin/ruby",
-            "rubyExtraPaths": [],
+            "rubyExtraPaths": []
         },
         "Python": {
             "python": '/usr/bin/python',
-            "pythonExtraPaths": [],
+            "pythonExtraPaths": []
         },
         "Python3": {
             "python": '/usr/bin/python3',
-            "pythonExtraPaths": [],
-        },
+            "pythonExtraPaths": []
+        }
     }
 
 Using
diff --git a/python_codeintel.py b/python_codeintel.py
@@ -9,32 +9,32 @@
     ...or in User Mouse Bindings (Packages/User/Default.sublime-mousemap):
         { "button": "button1", "modifiers": ["super"], "command": "goto_python_definition", "press_command": "drag_select" }
 
-Configuration files (`~/.codeintel/config' or `project_root/.codeintel/config'). Example:
+Configuration files (`~/.codeintel/config' or `project_root/.codeintel/config'). All configurations are optional. Example:
     {
         "PHP": {
             "php": '/usr/bin/php',
             "phpExtraPaths": [],
-            "phpConfigFile": 'php.ini',
+            "phpConfigFile": 'php.ini'
         },
         "JavaScript": {
-            "javascriptExtraPaths": [],
+            "javascriptExtraPaths": []
         },
         "Perl": {
             "perl": "/usr/bin/perl",
-            "perlExtraPaths": [],
+            "perlExtraPaths": []
         },
         "Perl": {
             "ruby": "/usr/bin/ruby",
-            "rubyExtraPaths": [],
+            "rubyExtraPaths": []
         },
         "Python": {
             "python": '/usr/bin/python',
-            "pythonExtraPaths": [],
+            "pythonExtraPaths": []
         },
         "Python3": {
             "python": '/usr/bin/python3',
-            "pythonExtraPaths": [],
-        },
+            "pythonExtraPaths": []
+        }
     }
 
 """
@@ -247,11 +247,13 @@ def codeintel_scan(view, path, content, lang):
         project_dir = path and find_folder(path, '.codeintel')
         if project_dir:
             tryReadCodeIntelDict(os.path.join(project_dir, 'config'), _config)
+        else:
+            project_dir = os.path.expanduser(os.path.join('~', '.codeintel'))
         config.update(_config.get(lang, {}))
         for conf in [ 'pythonExtraPaths', 'rubyExtraPaths', 'perlExtraPaths', 'javascriptExtraPaths', 'phpExtraPaths' ]:
             v = config.get(conf)
             if v and isinstance(v, (list, tuple)):
-                config[conf] = os.pathsep.join(v)
+                config[conf] = os.pathsep.join(p if p.startswith('/') else os.path.abspath(os.path.join(project_dir, '..', p)) for p in v)
 
         env = SimplePrefsEnvironment(**config)
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +{
 +    "Python": {
 +        "pythonExtraPaths": [ "./libs/" ]
 +    }
 +}
++