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

complete_opt: accept an optional length in completion desciptor

Browse Source
This commit is contained in:
Maxime Coste 2013-04-02 19:57:39 +02:00
parent aa44d05ede
commit 161fab13f7
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/input_handler.cc
View File

@ -499,16 +499,23 @@ static BufferCompletion complete_opt(const BufferIterator& pos, OptionManager& o
return {}; return {};
auto& desc = opt[0]; auto& desc = opt[0];
Regex re(R"((\d+):(\d+)@(\d+))"); static const Regex re(R"((\d+):(\d+)(?:\+(\d+))?@(\d+))");
boost::smatch match; boost::smatch match;
if (boost::regex_match(desc.begin(), desc.end(), match, re)) if (boost::regex_match(desc.begin(), desc.end(), match, re))
{ {
LineCount line = str_to_int(String(match[1].first, match[1].second)) - 1; LineCount line = str_to_int({match[1].first, match[1].second}) - 1;
ByteCount column = str_to_int(String(match[2].first, match[2].second)) - 1; ByteCount column = str_to_int({match[2].first, match[2].second}) - 1;
int timestamp = str_to_int(String(match[3].first, match[3].second));
BufferIterator end = pos;
if (match[3].matched)
{
ByteCount len = str_to_int({match[3].first, match[3].second});
end = pos + len;
}
int timestamp = str_to_int(String(match[4].first, match[4].second));
if (timestamp == pos.buffer().timestamp() and line == pos.line() and column == pos.column()) if (timestamp == pos.buffer().timestamp() and line == pos.line() and column == pos.column())
return { pos, pos, { opt.begin() + 1, opt.end() } }; return { pos, end, { opt.begin() + 1, opt.end() } };
} }
return {}; return {};
} }