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

Candidates are now stored per type and filepath

Browse Source
This commit is contained in:
Strahinja Val Markovic 2012-04-29 19:51:20 -07:00
parent ced1d0ad5a
commit 903452e855
6 changed files with 138 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
cpp/Completer.cpp
View File

@ -19,18 +19,24 @@
#include "Completer.h"
#include "Utils.h"
using boost::python::len;
using boost::python::extract;
namespace YouCompleteMe
{
Completer::Completer( const Pylist &candidates )
{
AddCandidatesToDatabase( candidates, "" );
AddCandidatesToDatabase( candidates, "", "" );
}
Completer::Completer( const Pylist &candidates, const std::string &filepath)
Completer::Completer( const Pylist &candidates,
const std::string &filetype,
const std::string &filepath)
{
AddCandidatesToDatabase( candidates, filepath );
AddCandidatesToDatabase( candidates, filetype, filepath );
}
@ -44,31 +50,53 @@ Completer::~Completer()
}
void Completer::AddCandidatesToDatabase( const Pylist &candidates,
void Completer::AddCandidatesToDatabase( const Pylist &new_candidates,
const std::string &filetype,
const std::string &filepath )
{
std::vector< Candidate *> &candidates =
GetCandidateVector( filetype, filepath );
int num_candidates = len( new_candidates );
candidates.clear();
candidates.reserve( num_candidates );
std::string candidate_text;
for (int i = 0; i < boost::python::len( candidates ); ++i)
for (int i = 0; i < num_candidates; ++i)
{
candidate_text = boost::python::extract< std::string >( candidates[ i ] );
candidate_text = extract< std::string >( new_candidates[ i ] );
Candidate *&candidate = GetValueElseInsert( candidate_repository_,
candidate_text, NULL );
if ( !candidate )
{
candidate = new Candidate( candidate_text );
candidates_.insert( candidate );
}
candidates.push_back( candidate );
}
}
void Completer::GetCandidatesForQuery(
const std::string &query, Pylist &candidates ) const
void Completer::CandidatesForQuery( const std::string &query,
Pylist &candidates ) const
{
CandidatesForQueryAndType( query, "", candidates );
}
void Completer::CandidatesForQueryAndType( const std::string &query,
const std::string &filetype,
Pylist &candidates ) const
{
FiletypeMap::const_iterator it = filetype_map_.find( filetype );
if ( it == filetype_map_.end() )
return;
Bitset query_bitset = LetterBitsetFromString( query );
std::vector< Result > results;
foreach ( Candidate* candidate, candidates_ )
foreach ( const FilepathToCandidates::value_type &path_and_candidates,
*it->second )
{
foreach ( Candidate* candidate, *path_and_candidates.second )
{
if ( !candidate->MatchesQueryBitset( query_bitset ) )
continue;
@ -77,10 +105,9 @@ void Completer::GetCandidatesForQuery(
if ( result.IsSubsequence() )
results.push_back( result );
}
}
// Needs to be stable to preserve the lexical sort of the candidates from the
// candidates_ container
std::stable_sort( results.begin(), results.end() );
std::sort( results.begin(), results.end() );
foreach ( const Result& result, results )
{
@ -89,4 +116,24 @@ void Completer::GetCandidatesForQuery(
}
std::vector< Candidate* >& Completer::GetCandidateVector(
const std::string &filetype,
const std::string &filepath )
{
boost::shared_ptr< FilepathToCandidates > &path_to_candidates =
filetype_map_[ filetype ];
if ( !path_to_candidates )
path_to_candidates.reset( new FilepathToCandidates() );
boost::shared_ptr< std::vector< Candidate* > > &candidates =
(*path_to_candidates)[ filepath ];
if ( !candidates )
candidates.reset( new std::vector< Candidate* >() );
return *candidates;
}
} // namespace YouCompleteMe

39
cpp/Completer.h
View File

@ -23,8 +23,8 @@
#include <boost/utility.hpp>
#include <boost/python.hpp>
#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
#include <set>
#include <vector>
#include <string>
@ -32,24 +32,49 @@ namespace YouCompleteMe
{
typedef boost::python::list Pylist;
// candidate text string -> candidate objects
typedef boost::unordered_map< std::string, Candidate* > CandidateRepository;
// filepath -> *( *candidate )
typedef boost::unordered_map< std::string,
boost::shared_ptr< std::vector< Candidate* > > > FilepathToCandidates;
// filetype -> *( filepath -> *( *candidate ) )
typedef boost::unordered_map< std::string,
boost::shared_ptr< FilepathToCandidates > > FiletypeMap;
// TODO: resolve problems with noncopyable
// class Completer : boost::noncopyable
class Completer
{
public:
Completer() {}
Completer( const Pylist &candidates );
Completer( const Pylist &candidates, const std::string &filepath );
Completer( const Pylist &candidates,
const std::string &filetype,
const std::string &filepath );
~Completer();
void AddCandidatesToDatabase( const Pylist &candidates,
void AddCandidatesToDatabase( const Pylist &new_candidates,
const std::string &filetype,
const std::string &filepath );
void GetCandidatesForQuery(
const std::string &query, Pylist &candidates ) const;
// Only provided for tests!
void CandidatesForQuery( const std::string &query,
Pylist &candidates ) const;
void CandidatesForQueryAndType( const std::string &query,
const std::string &filetype,
Pylist &candidates ) const;
private:
std::vector< Candidate* >& GetCandidateVector(
const std::string &filetype,
const std::string &filepath );
struct CandidatePointerLess
{
bool operator() ( const Candidate *first, const Candidate *second )
@ -58,8 +83,10 @@ private:
}
};
// This data structure owns all the Candidate pointers
CandidateRepository candidate_repository_;
std::set< Candidate*, CandidatePointerLess > candidates_;
FiletypeMap filetype_map_;
};
} // namespace YouCompleteMe

2
cpp/Utils.h
View File

@ -27,6 +27,7 @@ namespace YouCompleteMe
bool AlmostEqual( double a, double b );
template <class Container, class Key>
typename Container::mapped_type &
GetValueElseInsert( Container &container,
@ -37,6 +38,7 @@ GetValueElseInsert( Container &container,
.first->second;
}
template <class Container, class Key>
bool ContainsKey( Container &container, Key const& key)
{

2
cpp/indexer.cpp
View File

@ -26,5 +26,5 @@ BOOST_PYTHON_MODULE(indexer)
class_<Completer>( "Completer" )
.def( "AddCandidatesToDatabase", &Completer::AddCandidatesToDatabase )
.def( "GetCandidatesForQuery", &Completer::GetCandidatesForQuery );
.def( "CandidatesForQueryAndType", &Completer::CandidatesForQueryAndType );
}

25
cpp/tests/Completer_test.cpp
View File

@ -89,7 +89,7 @@ class CompleterTest : public ::testing::Test
TEST_F( CompleterTest, OneCandidate )
{
Pylist results;
Completer( Candidates( "foobar" ) ).GetCandidatesForQuery( "fbr", results );
Completer( Candidates( "foobar" ) ).CandidatesForQuery( "fbr", results );
EXPECT_THAT( ToStringVector( results ), ElementsAre( "foobar" ) );
}
@ -100,7 +100,7 @@ TEST_F( CompleterTest, ManyCandidateSimple )
Completer( Candidates(
"foobar",
"foobartest",
"Foobartest" ) ).GetCandidatesForQuery( "fbr", results );
"Foobartest" ) ).CandidatesForQuery( "fbr", results );
EXPECT_THAT( ToStringVector( results ),
WhenSorted( ElementsAre( "Foobartest",
@ -113,7 +113,7 @@ TEST_F( CompleterTest, FirstCharSameAsQueryWins )
Pylist results;
Completer( Candidates(
"foobar",
"afoobar" ) ).GetCandidatesForQuery( "fbr", results );
"afoobar" ) ).CandidatesForQuery( "fbr", results );
EXPECT_THAT( ToStringVector( results ),
ElementsAre( "foobar",
@ -125,7 +125,7 @@ TEST_F( CompleterTest, CompleteMatchForWordBoundaryCharsWins )
Pylist results;
Completer( Candidates(
"FooBarQux",
"FBaqux" ) ).GetCandidatesForQuery( "fbq", results );
"FBaqux" ) ).CandidatesForQuery( "fbq", results );
EXPECT_THAT( ToStringVector( results ),
ElementsAre( "FooBarQux",
@ -135,7 +135,7 @@ TEST_F( CompleterTest, CompleteMatchForWordBoundaryCharsWins )
Completer( Candidates(
"CompleterTest",
"CompleteMatchForWordBoundaryCharsWins"
) ).GetCandidatesForQuery( "ct", results2 );
) ).CandidatesForQuery( "ct", results2 );
EXPECT_THAT( ToStringVector( results2 ),
ElementsAre( "CompleterTest",
@ -144,8 +144,7 @@ TEST_F( CompleterTest, CompleteMatchForWordBoundaryCharsWins )
Pylist results3;
Completer( Candidates(
"FooBar",
"FooBarRux"
) ).GetCandidatesForQuery( "fbr", results3 );
"FooBarRux" ) ).CandidatesForQuery( "fbr", results3 );
EXPECT_THAT( ToStringVector( results3 ),
ElementsAre( "FooBarRux",
@ -157,7 +156,7 @@ TEST_F( CompleterTest, RatioUtilizationTieBreak )
Pylist results;
Completer( Candidates(
"FooBarQux",
"FooBarQuxZaa" ) ).GetCandidatesForQuery( "fbq", results );
"FooBarQuxZaa" ) ).CandidatesForQuery( "fbq", results );
EXPECT_THAT( ToStringVector( results ),
ElementsAre( "FooBarQux",
@ -166,7 +165,7 @@ TEST_F( CompleterTest, RatioUtilizationTieBreak )
Pylist results2;
Completer( Candidates(
"FooBar",
"FooBarRux" ) ).GetCandidatesForQuery( "fba", results2 );
"FooBarRux" ) ).CandidatesForQuery( "fba", results2 );
EXPECT_THAT( ToStringVector( results2 ),
ElementsAre( "FooBar",
@ -178,7 +177,7 @@ TEST_F( CompleterTest, QueryPrefixOfCandidateWins )
Pylist results;
Completer( Candidates(
"foobar",
"fbaroo" ) ).GetCandidatesForQuery( "foo", results );
"fbaroo" ) ).CandidatesForQuery( "foo", results );
EXPECT_THAT( ToStringVector( results ),
ElementsAre( "foobar",
@ -190,7 +189,7 @@ TEST_F( CompleterTest, ShorterCandidateWins )
Pylist results;
Completer( Candidates(
"FooBarQux",
"FaBarQux" ) ).GetCandidatesForQuery( "fbq", results );
"FaBarQux" ) ).CandidatesForQuery( "fbq", results );
EXPECT_THAT( ToStringVector( results ),
ElementsAre( "FaBarQux",
@ -199,7 +198,7 @@ TEST_F( CompleterTest, ShorterCandidateWins )
Pylist results2;
Completer( Candidates(
"CompleterT",
"CompleterTest" ) ).GetCandidatesForQuery( "co", results2 );
"CompleterTest" ) ).CandidatesForQuery( "co", results2 );
EXPECT_THAT( ToStringVector( results2 ),
ElementsAre( "CompleterT",
@ -211,7 +210,7 @@ TEST_F( CompleterTest, SameLowercaseCandidateWins )
Pylist results;
Completer( Candidates(
"foobar",
"Foobar" ) ).GetCandidatesForQuery( "foo", results );
"Foobar" ) ).CandidatesForQuery( "foo", results );
EXPECT_THAT( ToStringVector( results ),
ElementsAre( "foobar",

8
python/ycm.py
View File

@ -30,7 +30,10 @@ class CompletionSystem( object ):
def CompletionCandidatesForQuery( self, query ):
candidates = []
self.completer.GetCandidatesForQuery( SanitizeQuery( query ), candidates )
filetype = vim.eval( "&filetype" )
self.completer.CandidatesForQueryAndType( SanitizeQuery( query ),
filetype,
candidates )
return candidates
def AddBufferIdentifiers( self ):
@ -38,8 +41,9 @@ class CompletionSystem( object ):
text = RemoveIdentFreeText( text )
idents = re.findall( self.pattern, text )
filetype = vim.eval( "&filetype" )
filepath = vim.eval( "expand('%:p')" )
self.completer.AddCandidatesToDatabase( idents, filepath )
self.completer.AddCandidatesToDatabase( idents, filetype, filepath )
def CurrentColumn():
# vim's columns start at 1 while vim.current.line columns start at 0