mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-12-21 18:41:29 +03:00
Code Issues Projects Releases Wiki Activity

InsertCompleter: refactor line completer implementation

Browse Source
This commit is contained in:
Maxime Coste 2018-02-28 15:40:42 +11:00
parent 4e6b24eea2
commit 2193947b71
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/insert_completer.cc
View File

@ -361,17 +361,17 @@ InsertCompletion complete_line(const SelectionList& sels, const OptionManager& o
auto add_candidates = [&](const Buffer& buf) { auto add_candidates = [&](const Buffer& buf) {
for (LineCount l = 0_line; l < buf.line_count(); ++l) for (LineCount l = 0_line; l < buf.line_count(); ++l)
{ {
if (buf.name() == buffer.name() && l == cursor_pos.line)
continue;
const StringView line = buf[l];
if (prefix == line.substr(0_byte, prefix.length()))
{
StringView candidate = line.substr(0_byte, line.length()-1);
candidates.push_back({candidate.str(), "",
expand_tabs(candidate, tabstop, column)});
// perf: it's unlikely the user intends to search among >10 candidates anyway // perf: it's unlikely the user intends to search among >10 candidates anyway
if (candidates.size() == 100) if (candidates.size() == 100)
break; break;
if (buf.name() == buffer.name() && l == cursor_pos.line)
continue;
ByteCount len = buf[l].length();
if (len > cursor_pos.column and std::equal(prefix.begin(), prefix.end(), buf[l].begin()))
{
StringView candidate = buf[l].substr(0_byte, len-1);
candidates.push_back({candidate.str(), "",
expand_tabs(candidate, tabstop, column)});
} }
} }
}; };
@ -382,8 +382,7 @@ InsertCompletion complete_line(const SelectionList& sels, const OptionManager& o
{ {
for (const auto& buf : BufferManager::instance()) for (const auto& buf : BufferManager::instance())
{ {
if (buf.get() == &buffer or buf->flags() & Buffer::Flags::Debug) if (buf.get() != &buffer and not (buf->flags() & Buffer::Flags::Debug))
continue;
add_candidates(*buf); add_candidates(*buf);
} }
} }