summaryrefslogtreecommitdiff
path: root/src/insert_completer.cc
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2018-04-29 20:33:47 +1000
committerMaxime Coste <mawww@kakoune.org>2018-04-29 20:45:53 +1000
commit2fa553e728d5600426886e6301d80807f02db533 (patch)
tree68b888309dca772ba3eb862965cdacbf975e820e /src/insert_completer.cc
parentcbb91bcaed309a00f7b9de496e5adb346e3aab54 (diff)
Remove implicit conversion from String to DisplayAtom/DisplayLine
Diffstat (limited to 'src/insert_completer.cc')
-rw-r--r--src/insert_completer.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/insert_completer.cc b/src/insert_completer.cc
index 52f6d770..19fcaa87 100644
--- a/src/insert_completer.cc
+++ b/src/insert_completer.cc
@@ -179,12 +179,12 @@ InsertCompletion complete_word(const SelectionList& sels,
if (other_buffers && m.buffer)
{
const auto pad_len = longest + 1 - m.candidate().char_length();
- menu_entry.push_back(m.candidate().str());
- menu_entry.push_back(String{' ', pad_len});
+ menu_entry.push_back({ m.candidate().str(), {} });
+ menu_entry.push_back({ String{' ', pad_len}, {} });
menu_entry.push_back({ m.buffer->display_name(), faces["MenuInfo"] });
}
else
- menu_entry.push_back(m.candidate().str());
+ menu_entry.push_back({ m.candidate().str(), {} });
candidates.push_back({m.candidate().str(), "", std::move(menu_entry)});
return true;
@@ -226,7 +226,7 @@ InsertCompletion complete_filename(const SelectionList& sels,
{
for (auto& filename : Kakoune::complete_filename(prefix,
options["ignored_files"].get<Regex>()))
- candidates.push_back({ filename, "", filename });
+ candidates.push_back({ filename, "", {filename, {}} });
}
else
{
@@ -246,7 +246,7 @@ InsertCompletion complete_filename(const SelectionList& sels,
options["ignored_files"].get<Regex>()))
{
StringView candidate = filename.substr(dir.length());
- candidates.push_back({ candidate.str(), "", candidate.str() });
+ candidates.push_back({ candidate.str(), "", {candidate.str(), {}} });
}
visited_dirs.push_back(std::move(dir));
@@ -316,7 +316,7 @@ InsertCompletion complete_option(const SelectionList& sels,
auto& menu = std::get<2>(candidate);
match.menu_entry = not menu.empty() ?
parse_display_line(expand_tabs(menu, tabstop, column), faces)
- : DisplayLine{ expand_tabs(menu, tabstop, column) };
+ : DisplayLine{ expand_tabs(menu, tabstop, column), {} };
matches.push_back(std::move(match));
}
@@ -368,7 +368,7 @@ InsertCompletion complete_line(const SelectionList& sels,
{
StringView candidate = line.substr(0_byte, line.length()-1);
candidates.push_back({candidate.str(), "",
- expand_tabs(candidate, tabstop, column)});
+ {expand_tabs(candidate, tabstop, column), {}}});
// perf: it's unlikely the user intends to search among >10 candidates anyway
if (candidates.size() == 100)
break;