xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename prefix to query in complete helper function and tweak static_assert

Browse Source
This commit is contained in:
Maxime Coste 2016-03-02 13:32:35 +00:00
parent 761d316af6
commit 1fd7e80f04
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/completion.hh
View File

@ -56,18 +56,18 @@ inline Completions offset_pos(Completions completion, ByteCount offset)
} }
template<typename Container> template<typename Container>
CandidateList complete(StringView prefix, ByteCount cursor_pos, CandidateList complete(StringView query, ByteCount cursor_pos,
const Container& container) const Container& container)
{ {
using std::begin; using std::begin;
static_assert(not std::is_same<decltype(*begin(container)), String>::value, static_assert(not std::is_same<decltype(*begin(container)), String>::value,
"complete require long lived strings"); "complete require long lived strings, not temporaries");
prefix = prefix.substr(0, cursor_pos); query = query.substr(0, cursor_pos);
Vector<RankedMatch> matches; Vector<RankedMatch> matches;
for (const auto& str : container) for (const auto& str : container)
{ {
if (RankedMatch match{str, prefix}) if (RankedMatch match{str, query})
matches.push_back(match); matches.push_back(match);
} }
std::sort(matches.begin(), matches.end()); std::sort(matches.begin(), matches.end());