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

Preserve current word in word completion if found elsewhere

Browse Source 
If occurence count in the buffer if greater that one, do not
remove it from the matches.
This commit is contained in:
Maxime Coste 2014-04-22 19:31:31 +01:00
parent 65c818b859
commit 389308dfd8
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input_handler.cc
View File

@ -776,11 +776,13 @@ public:
String current_word{begin, end};
auto& word_db = get_word_db(buffer);
std::unordered_set<String> matches;
auto bufmatches = get_word_db(buffer).find_prefix(prefix);
auto bufmatches = word_db.find_prefix(prefix);
matches.insert(bufmatches.begin(), bufmatches.end());
matches.erase(current_word);
if (word_db.get_word_occurences(current_word) <= 1)
matches.erase(current_word);
if (other_buffers)
{

2
src/unit_tests.cc
View File

@ -80,6 +80,8 @@ void test_word_db()
auto res = word_db.find_prefix("");
std::sort(res.begin(), res.end());
kak_assert(res == std::vector<String>{ "allo" COMMA "kanaky" COMMA "mutch" COMMA "tchaa" COMMA "tchou" });
kak_assert(word_db.get_word_occurences("tchou") == 3);
kak_assert(word_db.get_word_occurences("allo") == 1);
buffer.erase(buffer.iterator_at({1, 6}), buffer.iterator_at({4, 0}));
res = word_db.find_prefix("");
std::sort(res.begin(), res.end());

8
src/word_db.cc
View File

@ -112,4 +112,12 @@ std::vector<String> WordDB::find_prefix(const String& prefix)
return res;
}
int WordDB::get_word_occurences(const String& word) const
{
auto it = m_words.find(word);
if (it != m_words.end())
return it->second;
return 0;
}
}

1
src/word_db.hh
View File

@ -18,6 +18,7 @@ public:
WordDB(const Buffer& buffer);
std::vector<String> find_prefix(const String& prefix);
int get_word_occurences(const String& word) const;
using WordList = std::map<String, int>;
private: