8484CODEINTEL_HOME_DIR = os .path .expanduser (os .path .join ('~' , '.codeintel' ))
8585__file__ = os .path .normpath (os .path .abspath (__file__ ))
8686__path__ = os .path .dirname (__file__ )
87+
8788libs_path = os .path .join (__path__ , 'libs' )
8889if libs_path not in sys .path :
8990 sys .path .insert (0 , libs_path )
9091
92+ arch_path = os .path .join (__path__ , 'arch' )
93+ if arch_path not in sys .path :
94+ sys .path .insert (0 , arch_path )
95+
9196from codeintel2 .common import *
9297from codeintel2 .manager import Manager
9398from codeintel2 .citadel import CitadelBuffer
@@ -114,12 +119,12 @@ def emit(self, record):
114119codeintel_log .handlers = [codeintel_hdlr ]
115120log .handlers = [stderr_hdlr ]
116121codeintel_log .setLevel (logging .INFO ) # INFO
117- logging .getLogger ("codeintel.db" ).setLevel (logging .WARNING ) # WARNING/INFO
122+ logging .getLogger ("codeintel.db" ).setLevel (logging .WARNING ) # WARNING
118123
119- for lang in ('css' , 'django' , 'html' , 'html5' , 'javascript' , 'mason' , 'nodejs' ,
124+ for logger in ('css' , 'django' , 'html' , 'html5' , 'javascript' , 'mason' , 'nodejs' ,
120125 'perl' , 'php' , 'python' , 'python3' , 'rhtml' , 'ruby' , 'smarty' ,
121126 'tcl' , 'templatetoolkit' , 'xbl' , 'xml' , 'xslt' , 'xul' ):
122- logging .getLogger ("codeintel." + lang ).setLevel (logging .DEBUG ) # WARNING/DEBUG
127+ logging .getLogger ("codeintel." + logger ).setLevel (logging .INFO ) # WARNING
123128log .setLevel (logging .ERROR ) # ERROR
124129
125130cpln_fillup_chars = {
@@ -308,7 +313,7 @@ def _trigger(cplns, calltips):
308313 'next_completion_if_showing' : False ,
309314 'auto_complete_commit_on_tab' : True ,
310315 })
311- elif calltips is not None :
316+ elif calltips is not None and False :
312317 # Trigger a tooltip
313318 calltip (view , 'tip' , calltips [0 ])
314319
@@ -502,6 +507,7 @@ def codeintel_cleanup(id):
502507
503508
504509def codeintel_manager (folders_id ):
510+ folders_id = None
505511 global _ci_mgr_ , condeintel_log_filename , condeintel_log_file
506512 mgr = _ci_mgr_ .get (folders_id )
507513 if mgr is None :
@@ -510,7 +516,7 @@ def codeintel_manager(folders_id):
510516 thread .finalize () # this finalizes the index, citadel and the manager and waits them to end (join)
511517 mgr = Manager (
512518 extra_module_dirs = None ,
513- db_base_dir = os .path .expanduser (os .path .join ('~' , '.codeintel' , 'databases' , folders_id )),
519+ db_base_dir = None , # os.path.expanduser(os.path.join('~', '.codeintel', 'databases', folders_id)),
514520 db_catalog_dirs = [],
515521 db_import_everything_langs = None ,
516522 )
@@ -577,7 +583,7 @@ def _codeintel_scan():
577583 if folder_path :
578584 # Try to find a suitable project directory (or best guess):
579585 for folder in ['.codeintel' , '.git' , '.hg' , '.svn' , 'trunk' ]:
580- project_dir = find_folder (folder_path , folder )
586+ project_dir = find_back (folder_path , folder )
581587 if project_dir :
582588 if folder == '.codeintel' :
583589 if project_dir == CODEINTEL_HOME_DIR or os .path .exists (os .path .join (project_dir , 'databases' )):
@@ -792,7 +798,7 @@ def _callback():
792798 codeintel_scan (view , path , content , lang , _codeintel , pos , forms )
793799
794800
795- def find_folder (start_at , look_for ):
801+ def find_back (start_at , look_for ):
796802 root = os .path .realpath ('/' )
797803 start_at = os .path .abspath (start_at )
798804 if not os .path .isdir (start_at ):
0 commit comments