vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added flag to turn off clang completion if desired

Browse Source
This commit is contained in:
Strahinja Val Markovic 2012-07-23 11:15:25 -07:00
parent cdb8dfc86b
commit cfede619f2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autoload/youcompleteme.vim
View File

@ -60,7 +60,10 @@ function! youcompleteme#Enable()
exe 'python sys.path = sys.path + ["' . s:script_folder_path . '/../python"]' exe 'python sys.path = sys.path + ["' . s:script_folder_path . '/../python"]'
py import ycm py import ycm
py identcomp = ycm.IdentifierCompleter() py identcomp = ycm.IdentifierCompleter()
py clangcomp = ycm.ClangCompleter()
if g:ycm_clang_completion_enabled
py clangcomp = ycm.ClangCompleter()
endif
" Calling this once solves the problem of BufRead/BufEnter not triggering for " Calling this once solves the problem of BufRead/BufEnter not triggering for
" the first loaded file. This should be the last command executed in this " the first loaded file. This should be the last command executed in this

3
plugin/youcompleteme.vim
View File

@ -29,6 +29,9 @@ let g:loaded_youcompleteme = 1
let s:save_cpo = &cpo let s:save_cpo = &cpo
set cpo&vim set cpo&vim
let g:ycm_clang_completion_enabled =
\ get(g:, 'ycm_clang_completion_enabled', 1)
" On-demand loading. Let's use the autoload folder and not slow down vim's " On-demand loading. Let's use the autoload folder and not slow down vim's
" startup procedure. " startup procedure.
augroup youcompletemeStart augroup youcompletemeStart

5
python/ycm.py
View File

@ -22,6 +22,7 @@ import vim
import indexer import indexer
MIN_NUM_CHARS = int( vim.eval( "g:ycm_min_num_of_chars_for_completion" ) ) MIN_NUM_CHARS = int( vim.eval( "g:ycm_min_num_of_chars_for_completion" ) )
CLANG_COMPLETION_ENABLED = int( vim.eval( "g:ycm_clang_completion_enabled" ) )
CLANG_FILETYPES = set( [ 'c', 'cpp', 'objc', 'objcpp' ] ) CLANG_FILETYPES = set( [ 'c', 'cpp', 'objc', 'objcpp' ] )
MAX_IDENTIFIER_COMPLETIONS_RETURNED = 10 MAX_IDENTIFIER_COMPLETIONS_RETURNED = 10
@ -211,6 +212,9 @@ def CurrentLineAndColumn():
def ShouldUseClang( start_column ): def ShouldUseClang( start_column ):
if not CLANG_COMPLETION_ENABLED:
return False
filetype = vim.eval( "&filetype" ) filetype = vim.eval( "&filetype" )
if filetype not in CLANG_FILETYPES: if filetype not in CLANG_FILETYPES:
return False return False
@ -332,4 +336,3 @@ def RemoveIdentFreeText( text ):
re.DOTALL | re.MULTILINE ) re.DOTALL | re.MULTILINE )
return re.sub( pattern, replacer, text ) return re.sub( pattern, replacer, text )