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

fix word completion taking the words being edited as candidates

Browse Source
This commit is contained in:
Maxime Coste 2016-04-08 13:58:33 +01:00
parent a36ee22760
commit 0a863c21e4
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/insert_completer.cc
View File

@ -84,19 +84,27 @@ InsertCompletion complete_word(const SelectionList& sels, const OptionManager& o
if (pos == buffer.begin() or not is_word(*(pos-1))) if (pos == buffer.begin() or not is_word(*(pos-1)))
return {}; return {};
auto end = Utf8It{buffer.iterator_at(cursor_pos), buffer}; ByteCoord word_begin;
auto begin = end-1; String prefix;
while (begin != buffer.begin() and is_word(*begin)) IdMap<int> sel_word_counts;
--begin; for (int i = 0; i < sels.size(); ++i)
if (not is_word(*begin)) {
++begin; auto end = Utf8It{buffer.iterator_at(sels[i].cursor()), buffer};
auto begin = end-1;
if (not skip_while_reverse(begin, buffer.begin(), is_word))
++begin;
auto prefix = buffer.string(begin.base().coord(), end.base().coord()); if (i == sels.main_index())
{
word_begin = begin.base().coord();
prefix = buffer.string(word_begin, end.base().coord());
}
while (end != buffer.end() and is_word(*end)) skip_while(end, buffer.end(), is_word);
++end;
auto current_word = buffer.string(begin.base().coord(), end.base().coord()); auto word = buffer.string(begin.base().coord(), end.base().coord());
++sel_word_counts[word];
}
struct RankedMatchAndBuffer : RankedMatch struct RankedMatchAndBuffer : RankedMatch
{ {
@ -120,8 +128,12 @@ InsertCompletion complete_word(const SelectionList& sels, const OptionManager& o
add_matches(buffer); add_matches(buffer);
if (get_word_db(buffer).get_word_occurences(current_word) <= 1) // Remove words that are being edited
unordered_erase(matches, StringView{current_word}); for (auto& word_count : sel_word_counts)
{
if (get_word_db(buffer).get_word_occurences(word_count.key) <= word_count.value)
unordered_erase(matches, StringView{word_count.key});
}
if (other_buffers) if (other_buffers)
{ {
@ -164,7 +176,7 @@ InsertCompletion complete_word(const SelectionList& sels, const OptionManager& o
candidates.push_back({m.candidate().str(), "", std::move(menu_entry)}); candidates.push_back({m.candidate().str(), "", std::move(menu_entry)});
} }
return { begin.base().coord(), cursor_pos, std::move(candidates), buffer.timestamp() }; return { word_begin, cursor_pos, std::move(candidates), buffer.timestamp() };
} }
template<bool require_slash> template<bool require_slash>