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

InputHandler: complete_word knows best when not to complete

Browse Source
This commit is contained in:
Maxime Coste 2013-03-09 13:23:47 +01:00
parent 89ba8535e2
commit eab2cc240a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/input_handler.cc
View File

@ -452,6 +452,9 @@ private:
static std::pair<CandidateList, BufferIterator> complete_word(const BufferIterator& pos) static std::pair<CandidateList, BufferIterator> complete_word(const BufferIterator& pos)
{ {
if (pos.is_begin() or not is_word(*utf8::previous(pos)))
return { {}, pos };
BufferIterator end = pos; BufferIterator end = pos;
BufferIterator begin = end-1; BufferIterator begin = end-1;
while (not begin.is_begin() and is_word(*begin)) while (not begin.is_begin() and is_word(*begin))
@ -538,11 +541,7 @@ public:
context().hooks().run_hook("InsertIdle", "", context()); context().hooks().run_hook("InsertIdle", "", context());
m_completer.reset(context()); m_completer.reset(context());
if (context().editor().selections().size() == 1) if (context().editor().selections().size() == 1)
{
BufferIterator prev = context().editor().selections().back().last();
if (not prev.is_begin() && is_word(*utf8::previous(prev)))
m_completer.select(context(), 0); m_completer.select(context(), 0);
}
}} }}
{ {
last_insert().first = mode; last_insert().first = mode;