mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-12 17:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1310 'Improve YCM contrib.'

Browse Source
This commit is contained in:
Thiago de Arruda
2014-10-20 08:14:36 -03:00
parent 77e918bc1f 20649051dd
commit 1eb3dae04a
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/YouCompleteMe/README.md
View File

@@ -1,4 +1,8 @@
# YouCompleteMe # YouCompleteMe Integration
## What is this?
This provides the necessary to configure vim's YCM plugin to provide C semantic support (completion, go-to-definition, etc) for the neovim project.
## Installation ## Installation
@@ -9,7 +13,10 @@ Install [YouCompleteMe](https://github.com/Valloric/YouCompleteMe).
### Step 2 ### Step 2
```bash ```bash
cp ycm_extra_conf.py ../../src/nvim/.ycm_extra_conf.py cp contrib/YouCompleteMe/ycm_extra_conf.py src/.ycm_extra_conf.py
echo src/nvim/.ycm_extra_conf.py >> ../../.git/info/exclude echo .ycm_extra_conf.py >> .git/info/exclude
make -C ../.. cmake make
(somewhere in you .vimrc files)
autocmd FileType c nnoremap <buffer> <silent> <C-]> :YcmCompleter GoTo<cr>
``` ```

14
contrib/YouCompleteMe/ycm_extra_conf.py
View File

@@ -8,7 +8,7 @@ def DirectoryOfThisScript():
def GetDatabase(): def GetDatabase():
compilation_database_folder = DirectoryOfThisScript() + '/../../build' compilation_database_folder = DirectoryOfThisScript() + '/../build'
if os.path.exists(compilation_database_folder): if os.path.exists(compilation_database_folder):
return ycm_core.CompilationDatabase(compilation_database_folder) return ycm_core.CompilationDatabase(compilation_database_folder)
return None return None
@@ -26,6 +26,9 @@ def GetCompilationInfoForFile(filename):
if IsHeaderFile(filename): if IsHeaderFile(filename):
basename = os.path.splitext(filename)[0] basename = os.path.splitext(filename)[0]
c_file = basename + '.c' c_file = basename + '.c'
# for pure headers (no c file), default to main.c
if not os.path.exists(c_file):
c_file = os.path.join(DirectoryOfThisScript(), 'main.c')
if os.path.exists(c_file): if os.path.exists(c_file):
compilation_info = database.GetCompilationInfoForFile(c_file) compilation_info = database.GetCompilationInfoForFile(c_file)
if compilation_info.compiler_flags_: if compilation_info.compiler_flags_:
@@ -38,7 +41,14 @@ def FlagsForFile(filename):
compilation_info = GetCompilationInfoForFile(filename) compilation_info = GetCompilationInfoForFile(filename)
if not compilation_info: if not compilation_info:
return None return None
# Add flags not needed for clang-the-binary,
# but needed for libclang-the-library (YCM uses this last one).
flags = (list(compilation_info.compiler_flags_)
if compilation_info.compiler_flags_
else [])
extra_flags = ['-Wno-newline-eof']
final_flags = flags + extra_flags
return { return {
'flags': compilation_info.compiler_flags_, 'flags': final_flags,
'do_cache': True 'do_cache': True
} }