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

exec and eval accepts a restore-selection parameter

Browse Source
This commit is contained in:
Maxime Coste 2013-01-17 13:58:09 +01:00
parent 621be2ceab
commit cedb0d18a3
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/commands.cc
View File

@ -538,7 +538,7 @@ void exec_keys(const KeyList& keys, Context& context)
void exec_string(const CommandParameters& params, Context& context) void exec_string(const CommandParameters& params, Context& context)
{ {
ParametersParser parser(params, { { "client", true } }); ParametersParser parser(params, { { "client", true }, { "restore-selections", false }});
if (parser.positional_count() == 0) if (parser.positional_count() == 0)
throw wrong_argument_count(); throw wrong_argument_count();
@ -552,12 +552,23 @@ void exec_string(const CommandParameters& params, Context& context)
Context& keys_context = parser.has_option("client") ? Context& keys_context = parser.has_option("client") ?
ClientManager::instance().get_client_context(parser.option_value("client")) ClientManager::instance().get_client_context(parser.option_value("client"))
: context; : context;
const bool restore_selections = parser.has_option("restore-selections");
Editor& editor = keys_context.editor();
DynamicSelectionList sels(editor.buffer());
if (restore_selections)
sels = editor.selections();
auto restore_editor = on_scope_end([&]{
if (restore_selections)
editor.select(sels);
});
exec_keys(keys, keys_context); exec_keys(keys, keys_context);
} }
void eval_string(const CommandParameters& params, Context& context) void eval_string(const CommandParameters& params, Context& context)
{ {
ParametersParser parser(params, { { "client", true } }); ParametersParser parser(params, { { "client", true }, { "restore-selections", false } });
if (parser.positional_count() == 0) if (parser.positional_count() == 0)
throw wrong_argument_count(); throw wrong_argument_count();
@ -568,6 +579,17 @@ void eval_string(const CommandParameters& params, Context& context)
Context& command_context = parser.has_option("client") ? Context& command_context = parser.has_option("client") ?
ClientManager::instance().get_client_context(parser.option_value("client")) ClientManager::instance().get_client_context(parser.option_value("client"))
: context; : context;
const bool restore_selections = parser.has_option("restore-selections");
Editor& editor = command_context.editor();
DynamicSelectionList sels(editor.buffer());
if (restore_selections)
sels = editor.selections();
auto restore_editor = on_scope_end([&]{
if (restore_selections)
editor.select(sels);
});
CommandManager::instance().execute(command, command_context); CommandManager::instance().execute(command, command_context);
} }