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

Merge remote-tracking branch 'lenormf/fix-trim-selections'

Browse Source
This commit is contained in:
Maxime Coste 2018-11-27 18:25:14 +11:00
commit e0b9327a9f
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/pages/keys.asciidoc
View File

@ -324,7 +324,8 @@ Yanking (copying) and pasting use the *"* register by default (See <<registers#,
option or the count parameter for tabstop
*_*::
trim selections
unselect whitespace surrounding each selection, drop those that only
contain whitespace
*<a-)>*::
rotate selections content, if specified, the count groups selections,

21
src/normal.cc
View File

@ -1711,17 +1711,32 @@ void spaces_to_tabs(Context& context, NormalParams params)
void trim_selections(Context& context, NormalParams)
{
auto& buffer = context.buffer();
for (auto& sel : context.selections())
auto& selections = context.selections();
Vector<int> to_remove;
for (int i = 0; i < (int)selections.size(); ++i)
{
auto& sel = selections[i];
auto beg = buffer.iterator_at(sel.min());
auto end = buffer.iterator_at(sel.max());
while (beg != end and is_blank(*beg))
++beg;
while (beg != end and is_blank(*end))
--end;
sel.min() = beg.coord();
sel.max() = end.coord();
if (beg == end and is_blank(*beg))
to_remove.push_back(i);
else
{
sel.min() = beg.coord();
sel.max() = end.coord();
}
}
if (to_remove.size() == selections.size())
throw runtime_error{"no selections remaining"};
for (auto& i : to_remove | reverse())
selections.remove(i);
}
SelectionList read_selections_from_register(char reg, Context& context)