Merge remote-tracking branch 'lenormf/reevaluate-exclamation-point'

This commit is contained in:
Maxime Coste 2019-12-14 09:13:43 +11:00
commit 32157a5809

View File

@ -637,10 +637,26 @@ void insert_output(Context& context, NormalParams)
if (cmdline.empty()) if (cmdline.empty())
return; return;
auto str = ShellManager::instance().eval(
cmdline, context, {}, ShellManager::Flags::WaitForStdout).first;
ScopedEdition edition(context); ScopedEdition edition(context);
context.selections().insert(str, mode); Buffer& buffer = context.buffer();
auto& shell_manager = ShellManager::instance();
auto& selections = context.selections();
Vector<String> ins;
const size_t old_main = selections.main_index();
for (size_t i = 0; i < selections.size(); i++)
{
selections.set_main_index(i);
auto& sel = selections.main();
auto str = shell_manager.eval(cmdline, context, content(buffer, sel),
ShellManager::Flags::WaitForStdout).first;
ins.emplace_back(str);
}
selections.set_main_index(old_main);
selections.insert(ins, mode);
}); });
} }