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

Fix main selection handling in keep pipe ($)

Browse Source 
$kak_reg_hash will properly contain the current selection index when
executing the shell command, fixing its use.

Fixes #1503
This commit is contained in:
Maxime Coste 2017-07-19 17:42:41 +02:00
parent d1de9912c0
commit d3f438810e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/normal.cc
View File

@ -1003,15 +1003,27 @@ void keep_pipe(Context& context, NormalParams)
const Buffer& buffer = context.buffer(); const Buffer& buffer = context.buffer();
auto& shell_manager = ShellManager::instance(); auto& shell_manager = ShellManager::instance();
Vector<Selection> keep; Vector<Selection> keep;
for (auto& sel : context.selections())
auto& selections = context.selections();
const size_t old_main = selections.main_index();
size_t new_main = -1;
for (int i = 0; i < selections.size(); ++i)
{ {
auto& sel = selections[i];
selections.set_main_index(i);
if (shell_manager.eval(cmdline, context, content(buffer, sel), if (shell_manager.eval(cmdline, context, content(buffer, sel),
ShellManager::Flags::None).second == 0) ShellManager::Flags::None).second == 0)
{
keep.push_back(sel); keep.push_back(sel);
if (i >= old_main and new_main == (size_t)-1)
new_main = keep.size() - 1;
}
} }
if (keep.empty()) if (keep.empty())
throw runtime_error("no selections remaining"); throw runtime_error("no selections remaining");
context.selections_write_only() = std::move(keep); if (new_main == -1)
new_main = keep.size() - 1;
context.selections_write_only().set(std::move(keep), new_main);
}); });
} }
template<bool indent_empty = false> template<bool indent_empty = false>