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

Renaming ycm_clang_options to ycm_extra_conf

Browse Source
This commit is contained in:
Strahinja Val Markovic 2013-01-24 09:59:21 -08:00
parent 90fe31f98e
commit 19637cadda
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -236,7 +236,7 @@ TODO, still WIP
plugin. It has support for YCM and together they will provide you with compile plugin. It has support for YCM and together they will provide you with compile
errors/warnings practically instantly and without saving the file. errors/warnings practically instantly and without saving the file.
YCM looks for a `.ycm_clang_options.py` file in the directory of the opened file YCM looks for a `.ycm_extra_conf.py` file in the directory of the opened file
or in any directory above it in the hierarchy (recursively); when the file is or in any directory above it in the hierarchy (recursively); when the file is
found, it is loaded (only once!) as a Python module. YCM calls a `FlagsForFile` found, it is loaded (only once!) as a Python module. YCM calls a `FlagsForFile`
method in that module which should provide it with the information necessary to method in that module which should provide it with the information necessary to
@ -246,7 +246,7 @@ This system was designed this way so that the user can perform any arbitrary
sequence of operations to produce a list of compilation flags YCM should hand sequence of operations to produce a list of compilation flags YCM should hand
to Clang. to Clang.
[See YCM's own `.ycm_clang_options.py`][flags_example] for details on how this [See YCM's own `.ycm_extra_conf.py`][flags_example] for details on how this
works. You should be able to use it as a starting point. Hint: just replace the works. You should be able to use it as a starting point. Hint: just replace the
strings in the `flags` variable with compilation flags necessary for your strings in the `flags` variable with compilation flags necessary for your
project. That should be enough for 99% of projects. project. That should be enough for 99% of projects.
@ -254,7 +254,7 @@ project. That should be enough for 99% of projects.
Yes, [Clang's `CompilationDatabase` system][compdb] is also supported. Again, see the Yes, [Clang's `CompilationDatabase` system][compdb] is also supported. Again, see the
above linked example file. above linked example file.
TODO: compile flags, include paths, ycm_clang_options, CompilationDatabase TODO: compile flags, include paths, ycm_extra_conf, CompilationDatabase
support, how the search system works (subsequence match), extending the semantic support, how the search system works (subsequence match), extending the semantic
engine for other langs, using ListToggle engine for other langs, using ListToggle
@ -413,5 +413,5 @@ This software is licensed under the [GPL v3 license][gpl].
[gpl]: http://www.gnu.org/copyleft/gpl.html [gpl]: http://www.gnu.org/copyleft/gpl.html
[vim]: http://www.vim.org/ [vim]: http://www.vim.org/
[syntastic]: https://github.com/scrooloose/syntastic [syntastic]: https://github.com/scrooloose/syntastic
[flags_example]: https://github.com/Valloric/YouCompleteMe/blob/master/cpp/ycm/.ycm_clang_options.py [flags_example]: https://github.com/Valloric/YouCompleteMe/blob/master/cpp/ycm/.ycm_extra_conf.py
[compdb]: http://clang.llvm.org/docs/JSONCompilationDatabase.html [compdb]: http://clang.llvm.org/docs/JSONCompilationDatabase.html

2
cpp/ycm/.ycm_clang_options.py → cpp/ycm/.ycm_extra_conf.py
View File

@ -110,7 +110,7 @@ def FlagsForFile( filename ):
# NOTE: This is just for YouCompleteMe; it's highly likely that your project # NOTE: This is just for YouCompleteMe; it's highly likely that your project
# does NOT need to remove the stdlib flag. DO NOT USE THIS IN YOUR # does NOT need to remove the stdlib flag. DO NOT USE THIS IN YOUR
# ycm_clang_options IF YOU'RE NOT 100% YOU NEED IT. # ycm_extra_conf IF YOU'RE NOT 100% YOU NEED IT.
try: try:
final_flags.remove( '-stdlib=libc++' ) final_flags.remove( '-stdlib=libc++' )
except ValueError: except ValueError:

10
python/completers/cpp/flags.py
View File

@ -25,10 +25,10 @@ import string
import sys import sys
import vimsupport import vimsupport
CLANG_OPTIONS_FILENAME = '.ycm_clang_options.py' YCM_EXTRA_CONF_FILENAME = '.ycm_extra_conf.py'
NO_OPTIONS_FILENAME_MESSAGE = ('No {0} file detected, so no compile flags ' NO_OPTIONS_FILENAME_MESSAGE = ('No {0} file detected, so no compile flags '
'are available. Thus no semantic support for C/C++/ObjC/ObjC++.').format( 'are available. Thus no semantic support for C/C++/ObjC/ObjC++.').format(
CLANG_OPTIONS_FILENAME ) YCM_EXTRA_CONF_FILENAME )
class Flags( object ): class Flags( object ):
def __init__( self ): def __init__( self ):
@ -86,15 +86,15 @@ class Flags( object ):
def _FlagsModuleSourceFileForFile( filename ): def _FlagsModuleSourceFileForFile( filename ):
"""For a given filename, finds its nearest CLANG_OPTIONS_FILENAME file that """For a given filename, finds its nearest YCM_EXTRA_CONF_FILENAME file that
will compute the flags necessary to compile the file. Returns None if no will compute the flags necessary to compile the file. Returns None if no
CLANG_OPTIONS_FILENAME file could be found.""" YCM_EXTRA_CONF_FILENAME file could be found."""
parent_folder = os.path.dirname( filename ) parent_folder = os.path.dirname( filename )
old_parent_folder = '' old_parent_folder = ''
while True: while True:
current_file = os.path.join( parent_folder, CLANG_OPTIONS_FILENAME ) current_file = os.path.join( parent_folder, YCM_EXTRA_CONF_FILENAME )
if os.path.exists( current_file ): if os.path.exists( current_file ):
return current_file return current_file