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

Propagate shell context through prompt/onkey/menu commands

Browse Source
This commit is contained in:
Maxime Coste 2015-11-18 20:15:51 +00:00
parent 5743ea7384
commit 5c37f0dd5e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands.cc
View File

@ -1360,7 +1360,7 @@ const CommandDesc prompt_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& params, Context& context, const ShellContext&) [](const ParametersParser& params, Context& context, const ShellContext& shell_context)
{ {
if (params[1].length() != 1) if (params[1].length() != 1)
throw runtime_error("register name should be a single character"); throw runtime_error("register name should be a single character");
@ -1376,7 +1376,7 @@ const CommandDesc prompt_cmd = {
return; return;
RegisterManager::instance()[reg] = ConstArrayView<String>(str.str()); RegisterManager::instance()[reg] = ConstArrayView<String>(str.str());
CommandManager::instance().execute(command, context); CommandManager::instance().execute(command, context, shell_context);
}); });
} }
}; };
@ -1394,7 +1394,7 @@ const CommandDesc menu_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context, const ShellContext&) [](const ParametersParser& parser, Context& context, const ShellContext& shell_context)
{ {
const bool with_select_cmds = (bool)parser.get_switch("select-cmds"); const bool with_select_cmds = (bool)parser.get_switch("select-cmds");
const bool markup = (bool)parser.get_switch("markup"); const bool markup = (bool)parser.get_switch("markup");
@ -1425,9 +1425,9 @@ const CommandDesc menu_cmd = {
context.input_handler().menu(choices, context.input_handler().menu(choices,
[=](int choice, MenuEvent event, Context& context) { [=](int choice, MenuEvent event, Context& context) {
if (event == MenuEvent::Validate and choice >= 0 and choice < commands.size()) if (event == MenuEvent::Validate and choice >= 0 and choice < commands.size())
CommandManager::instance().execute(commands[choice], context); CommandManager::instance().execute(commands[choice], context, shell_context);
if (event == MenuEvent::Select and choice >= 0 and choice < select_cmds.size()) if (event == MenuEvent::Select and choice >= 0 and choice < select_cmds.size())
CommandManager::instance().execute(select_cmds[choice], context); CommandManager::instance().execute(select_cmds[choice], context, shell_context);
}); });
} }
}; };
@ -1440,14 +1440,14 @@ const CommandDesc onkey_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context, const ShellContext&) [](const ParametersParser& parser, Context& context, const ShellContext& shell_context)
{ {
String reg = parser[0]; String reg = parser[0];
String command = parser[1]; String command = parser[1];
context.input_handler().on_next_key(KeymapMode::None, context.input_handler().on_next_key(KeymapMode::None,
[=](Key key, Context& context) { [=](Key key, Context& context) {
RegisterManager::instance()[reg] = key_to_str(key); RegisterManager::instance()[reg] = key_to_str(key);
CommandManager::instance().execute(command, context); CommandManager::instance().execute(command, context, shell_context);
}); });
} }
}; };