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

<space>, <a-space>: throw on invalid preconditions

Browse Source
This commit is contained in:
Olivier Perret 2017-03-03 13:44:09 +01:00
parent eace7e0424
commit 033b259e5b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/normal.cc
View File

@ -1654,8 +1654,9 @@ void keep_selection(Context& context, NormalParams p)
{ {
auto& selections = context.selections(); auto& selections = context.selections();
const int index = p.count ? p.count-1 : selections.main_index(); const int index = p.count ? p.count-1 : selections.main_index();
if (index < selections.size()) if (index >= selections.size())
selections = SelectionList{ selections.buffer(), std::move(selections[index]) }; throw runtime_error("invalid selection index");
selections = SelectionList{ selections.buffer(), std::move(selections[index]) };
selections.check_invariant(); selections.check_invariant();
} }
@ -1663,13 +1664,14 @@ void remove_selection(Context& context, NormalParams p)
{ {
auto& selections = context.selections(); auto& selections = context.selections();
const int index = p.count ? p.count-1 : selections.main_index(); const int index = p.count ? p.count-1 : selections.main_index();
if (selections.size() > 1 and index < selections.size()) if (index >= selections.size())
{ throw runtime_error("invalid selection index");
selections.remove(index); if (selections.size() == 1)
size_t main_index = selections.main_index(); throw runtime_error("no selections remaining");
if (index < main_index or main_index == selections.size()) selections.remove(index);
selections.set_main_index(main_index - 1); size_t main_index = selections.main_index();
} if (index < main_index or main_index == selections.size())
selections.set_main_index(main_index - 1);
selections.check_invariant(); selections.check_invariant();
} }