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

WordCompleter: avoid word currently being edited

Browse Source
This commit is contained in:
Maxime Coste 2012-10-08 19:14:48 +02:00
parent 0a686573ab
commit bff015d5b9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client.cc
View File

@ -348,7 +348,7 @@ private:
++begin; ++begin;
String prefix = context.buffer().string(begin, end); String prefix = context.buffer().string(begin, end);
m_completions = complete_word(context, prefix); m_completions = complete_word(context, prefix, begin);
if (m_completions.empty()) if (m_completions.empty())
return false; return false;
@ -363,7 +363,8 @@ private:
} }
CandidateList complete_word(const Context& context, CandidateList complete_word(const Context& context,
const String& prefix) const String& prefix,
const BufferIterator& pos)
{ {
String ex = "\\<\\Q" + prefix + "\\E\\w+\\>"; String ex = "\\<\\Q" + prefix + "\\E\\w+\\>";
Regex re(ex.begin(), ex.end()); Regex re(ex.begin(), ex.end());
@ -372,13 +373,15 @@ private:
boost::regex_iterator<BufferIterator> end; boost::regex_iterator<BufferIterator> end;
CandidateList result; CandidateList result;
while (it != end) for (; it != end; ++it)
{ {
auto& match = (*it)[0]; auto& match = (*it)[0];
if (match.first <= pos and pos < match.second)
continue;
String content = buffer.string(match.first, match.second); String content = buffer.string(match.first, match.second);
if (not contains(result, content)) if (not contains(result, content))
result.emplace_back(std::move(content)); result.emplace_back(std::move(content));
++it;
} }
std::sort(result.begin(), result.end()); std::sort(result.begin(), result.end());
return result; return result;