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

Renamed ClangComplete to ClangCompleter

Browse Source
This commit is contained in:
Strahinja Val Markovic 2012-07-10 23:28:58 -07:00
parent 545792c055
commit 39ecf76798
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/youcompleteme.vim
View File

@ -66,7 +66,7 @@ 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 csystem = ycm.CompletionSystem() py csystem = ycm.CompletionSystem()
py clangcomp = ycm.ClangComplete() py clangcomp = ycm.ClangCompleter()
endfunction endfunction

20
cpp/ycm/ClangComplete.cpp → cpp/ycm/ClangCompleter.cpp
View File

@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>. // along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>.
#include "ClangComplete.h" #include "ClangCompleter.h"
#include "standard.h" #include "standard.h"
#include <clang-c/Index.h> #include <clang-c/Index.h>
@ -87,13 +87,13 @@ std::vector< std::string > ToStringVector( CXCodeCompleteResults *results )
} // unnamed namespace } // unnamed namespace
ClangComplete::ClangComplete() ClangCompleter::ClangCompleter()
{ {
clang_index_ = clang_createIndex( 0, 0 ); clang_index_ = clang_createIndex( 0, 0 );
} }
ClangComplete::~ClangComplete() ClangCompleter::~ClangCompleter()
{ {
foreach ( const TranslationUnitForFilename::value_type &filename_unit, foreach ( const TranslationUnitForFilename::value_type &filename_unit,
filename_to_translation_unit_ ) filename_to_translation_unit_ )
@ -105,14 +105,14 @@ ClangComplete::~ClangComplete()
} }
void ClangComplete::SetGlobalCompileFlags( void ClangCompleter::SetGlobalCompileFlags(
const std::vector< std::string > &flags ) const std::vector< std::string > &flags )
{ {
global_flags_ = flags; global_flags_ = flags;
} }
void ClangComplete::SetFileCompileFlags( void ClangCompleter::SetFileCompileFlags(
const std::string &filename, const std::string &filename,
const std::vector< std::string > &flags ) const std::vector< std::string > &flags )
{ {
@ -120,7 +120,7 @@ void ClangComplete::SetFileCompileFlags(
} }
void ClangComplete::UpdateTranslationUnit( void ClangCompleter::UpdateTranslationUnit(
const std::string &filename, const std::string &filename,
const std::vector< UnsavedFile > &unsaved_files ) const std::vector< UnsavedFile > &unsaved_files )
{ {
@ -147,7 +147,7 @@ void ClangComplete::UpdateTranslationUnit(
} }
std::vector< std::string > ClangComplete::CandidatesForLocationInFile( std::vector< std::string > ClangCompleter::CandidatesForLocationInFile(
const std::string &filename, const std::string &filename,
int line, int line,
int column, int column,
@ -181,7 +181,7 @@ std::vector< std::string > ClangComplete::CandidatesForLocationInFile(
} }
CXTranslationUnit ClangComplete::CreateTranslationUnit( CXTranslationUnit ClangCompleter::CreateTranslationUnit(
const std::string &filename, const std::string &filename,
const std::vector< UnsavedFile > &unsaved_files ) const std::vector< UnsavedFile > &unsaved_files )
{ {
@ -200,7 +200,7 @@ CXTranslationUnit ClangComplete::CreateTranslationUnit(
} }
std::vector< const char* > ClangComplete::ClangFlagsForFilename( std::vector< const char* > ClangCompleter::ClangFlagsForFilename(
const std::string &filename ) const std::string &filename )
{ {
std::vector< const char* > flags; std::vector< const char* > flags;
@ -222,7 +222,7 @@ std::vector< const char* > ClangComplete::ClangFlagsForFilename(
} }
CXTranslationUnit ClangComplete::GetTranslationUnitForFile( CXTranslationUnit ClangCompleter::GetTranslationUnitForFile(
const std::string &filename, const std::string &filename,
const std::vector< UnsavedFile > &unsaved_files ) const std::vector< UnsavedFile > &unsaved_files )
{ {

6
cpp/ycm/ClangComplete.h → cpp/ycm/ClangCompleter.h
View File

@ -54,11 +54,11 @@ typedef boost::unordered_map< std::string, CXTranslationUnit >
TranslationUnitForFilename; TranslationUnitForFilename;
class ClangComplete : boost::noncopyable class ClangCompleter : boost::noncopyable
{ {
public: public:
ClangComplete(); ClangCompleter();
~ClangComplete(); ~ClangCompleter();
void SetGlobalCompileFlags( const std::vector< std::string > &flags ); void SetGlobalCompileFlags( const std::vector< std::string > &flags );

12
cpp/ycm/indexer.cpp
View File

@ -16,7 +16,7 @@
// along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>. // along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>.
#include "IdentifierCompleter.h" #include "IdentifierCompleter.h"
#include "ClangComplete.h" #include "ClangCompleter.h"
#include "Future.h" #include "Future.h"
#include <boost/python.hpp> #include <boost/python.hpp>
@ -60,10 +60,10 @@ BOOST_PYTHON_MODULE(indexer)
class_< std::vector< UnsavedFile > >( "UnsavedFileVec" ) class_< std::vector< UnsavedFile > >( "UnsavedFileVec" )
.def( vector_indexing_suite< std::vector< UnsavedFile > >() ); .def( vector_indexing_suite< std::vector< UnsavedFile > >() );
class_< ClangComplete, boost::noncopyable >( "ClangComplete" ) class_< ClangCompleter, boost::noncopyable >( "ClangCompleter" )
.def( "SetGlobalCompileFlags", &ClangComplete::SetGlobalCompileFlags ) .def( "SetGlobalCompileFlags", &ClangCompleter::SetGlobalCompileFlags )
.def( "SetFileCompileFlags", &ClangComplete::SetFileCompileFlags ) .def( "SetFileCompileFlags", &ClangCompleter::SetFileCompileFlags )
.def( "UpdateTranslationUnit", &ClangComplete::UpdateTranslationUnit ) .def( "UpdateTranslationUnit", &ClangCompleter::UpdateTranslationUnit )
.def( "CandidatesForLocationInFile", .def( "CandidatesForLocationInFile",
&ClangComplete::CandidatesForLocationInFile ); &ClangCompleter::CandidatesForLocationInFile );
} }

4
python/ycm.py
View File

@ -88,9 +88,9 @@ class CompletionSystem( object ):
filepath, filepath,
True ) True )
class ClangComplete( object ): class ClangCompleter( object ):
def __init__( self ): def __init__( self ):
self.completer = indexer.ClangComplete() self.completer = indexer.ClangCompleter()
def CandidatesForQuery( self, query ): def CandidatesForQuery( self, query ):
files = indexer.UnsavedFileVec() files = indexer.UnsavedFileVec()