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

Set main selection index to the current sel when piping different selections

Browse Source 
Fixes #884
This commit is contained in:
Maxime Coste 2016-10-23 19:54:40 +01:00
parent d2aa292c17
commit 2809ce00de
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/normal.cc
View File

@ -410,12 +410,15 @@ void pipe(Context& context, NormalParams)
Buffer& buffer = context.buffer(); Buffer& buffer = context.buffer();
SelectionList& selections = context.selections(); SelectionList& selections = context.selections();
const int old_main = selections.main_index();
auto restore_main = on_scope_end([&] { selections.set_main_index(old_main); });
if (replace) if (replace)
{ {
Vector<String> strings; Vector<String> strings;
for (auto& sel : selections) for (int i = 0; i < selections.size(); ++i)
{ {
String in = content(buffer, sel); selections.set_main_index(i);
String in = content(buffer, selections.main());
const bool insert_eol = in.back() != '\n'; const bool insert_eol = in.back() != '\n';
if (insert_eol) if (insert_eol)
in += '\n'; in += '\n';
@ -432,10 +435,13 @@ void pipe(Context& context, NormalParams)
} }
else else
{ {
for (auto& sel : selections) for (int i = 0; i < selections.size(); ++i)
{
selections.set_main_index(i);
ShellManager::instance().eval(real_cmd, context, ShellManager::instance().eval(real_cmd, context,
content(buffer, sel), content(buffer, selections.main()),
ShellManager::Flags::None); ShellManager::Flags::None);
}
} }
}); });
} }