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

Pass ShellContext to commands

Browse Source 
Fix #427
This commit is contained in:
Maxime Coste 2015-10-22 13:59:23 +01:00
parent e51ef6c3c2
commit da7fc3311f
3 changed files with 59 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/command_manager.cc
View File

@ -405,6 +405,7 @@ CommandManager::find_command(const Context& context, const String& name) const
void CommandManager::execute_single_command(CommandParameters params, void CommandManager::execute_single_command(CommandParameters params,
Context& context, Context& context,
const ShellContext& shell_context,
CharCoord pos) const CharCoord pos) const
{ {
if (params.empty()) if (params.empty())
@ -419,7 +420,7 @@ void CommandManager::execute_single_command(CommandParameters params,
{ {
ParametersParser parameter_parser(param_view, ParametersParser parameter_parser(param_view,
command_it->second.param_desc); command_it->second.param_desc);
command_it->second.command(parameter_parser, context); command_it->second.command(parameter_parser, context, shell_context);
} }
catch (runtime_error& error) catch (runtime_error& error)
{ {
@ -444,7 +445,7 @@ void CommandManager::execute(StringView command_line,
if (it->type() == Token::Type::CommandSeparator) if (it->type() == Token::Type::CommandSeparator)
{ {
execute_single_command(params, context, command_coord); execute_single_command(params, context, shell_context, command_coord);
params.clear(); params.clear();
} }
// Shell expand are retokenized // Shell expand are retokenized
@ -464,7 +465,7 @@ void CommandManager::execute(StringView command_line,
else else
params.push_back(expand_token(*it, context, shell_context)); params.push_back(expand_token(*it, context, shell_context));
} }
execute_single_command(params, context, command_coord); execute_single_command(params, context, shell_context, command_coord);
} }
CommandInfo CommandManager::command_info(const Context& context, StringView command_line) const CommandInfo CommandManager::command_info(const Context& context, StringView command_line) const

10
src/command_manager.hh
View File

@ -19,11 +19,15 @@ namespace Kakoune
class Context; class Context;
using CommandParameters = ConstArrayView<String>; using CommandParameters = ConstArrayView<String>;
using Command = std::function<void (const ParametersParser& parser, Context& context)>; using Command = std::function<void (const ParametersParser& parser,
Context& context,
const ShellContext& shell_context)>;
using CommandCompleter = std::function<Completions (const Context& context, using CommandCompleter = std::function<Completions (const Context& context,
CompletionFlags, CompletionFlags,
CommandParameters, CommandParameters,
size_t, ByteCount)>; size_t, ByteCount)>;
using CommandHelper = std::function<String (const Context& context, CommandParameters)>; using CommandHelper = std::function<String (const Context& context, CommandParameters)>;
enum class CommandFlags enum class CommandFlags
@ -84,7 +88,9 @@ public:
private: private:
void execute_single_command(CommandParameters params, void execute_single_command(CommandParameters params,
Context& context, CharCoord pos) const; Context& context,
const ShellContext& shell_context,
CharCoord pos) const;
struct CommandDescriptor struct CommandDescriptor
{ {

94
src/commands.cc
View File

@ -120,11 +120,11 @@ struct CommandDesc
CommandFlags flags; CommandFlags flags;
CommandHelper helper; CommandHelper helper;
CommandCompleter completer; CommandCompleter completer;
void (*func)(const ParametersParser&, Context&); void (*func)(const ParametersParser&, Context&, const ShellContext&);
}; };
template<bool force_reload> template<bool force_reload>
void edit(const ParametersParser& parser, Context& context) void edit(const ParametersParser& parser, Context& context, const ShellContext&)
{ {
if (parser.positional_count() == 0 and not force_reload) if (parser.positional_count() == 0 and not force_reload)
throw wrong_argument_count(); throw wrong_argument_count();
@ -215,7 +215,7 @@ const CommandDesc force_edit_cmd = {
edit<true> edit<true>
}; };
void write_buffer(const ParametersParser& parser, Context& context) void write_buffer(const ParametersParser& parser, Context& context, const ShellContext&)
{ {
Buffer& buffer = context.buffer(); Buffer& buffer = context.buffer();
@ -256,7 +256,7 @@ const CommandDesc writeall_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser&, Context&){ write_all_buffers(); } [](const ParametersParser&, Context&, const ShellContext&){ write_all_buffers(); }
}; };
const CommandDesc kill_cmd = { const CommandDesc kill_cmd = {
@ -267,7 +267,7 @@ const CommandDesc kill_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser&, Context&){ throw kill_session{}; } [](const ParametersParser&, Context&, const ShellContext&){ throw kill_session{}; }
}; };
template<bool force> template<bool force>
@ -307,7 +307,7 @@ const CommandDesc quit_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser&, Context&){ quit<false>(); } [](const ParametersParser&, Context&, const ShellContext&){ quit<false>(); }
}; };
const CommandDesc force_quit_cmd = { const CommandDesc force_quit_cmd = {
@ -320,7 +320,7 @@ const CommandDesc force_quit_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser&, Context&){ quit<true>(); } [](const ParametersParser&, Context&, const ShellContext&){ quit<true>(); }
}; };
const CommandDesc write_quit_cmd = { const CommandDesc write_quit_cmd = {
@ -331,9 +331,9 @@ const CommandDesc write_quit_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext& shell_context)
{ {
write_buffer(parser, context); write_buffer(parser, context, shell_context);
quit<false>(); quit<false>();
} }
}; };
@ -347,9 +347,9 @@ const CommandDesc force_write_quit_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext& shell_context)
{ {
write_buffer(parser, context); write_buffer(parser, context, shell_context);
quit<true>(); quit<true>();
} }
}; };
@ -362,7 +362,7 @@ const CommandDesc writeall_quit_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
write_all_buffers(); write_all_buffers();
quit<false>(); quit<false>();
@ -377,7 +377,7 @@ const CommandDesc buffer_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
buffer_completer, buffer_completer,
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
Buffer* oldbuf = &context.buffer(); Buffer* oldbuf = &context.buffer();
Buffer& buffer = BufferManager::instance().get_buffer(parser[0]); Buffer& buffer = BufferManager::instance().get_buffer(parser[0]);
@ -392,7 +392,7 @@ const CommandDesc buffer_cmd = {
}; };
template<bool next> template<bool next>
void cycle_buffer(const ParametersParser& parser, Context& context) void cycle_buffer(const ParametersParser& parser, Context& context, const ShellContext&)
{ {
Buffer* oldbuf = &context.buffer(); Buffer* oldbuf = &context.buffer();
auto it = find_if(BufferManager::instance(), auto it = find_if(BufferManager::instance(),
@ -446,7 +446,7 @@ const CommandDesc bufferprev_cmd = {
}; };
template<bool force> template<bool force>
void delete_buffer(const ParametersParser& parser, Context& context) void delete_buffer(const ParametersParser& parser, Context& context, const ShellContext&)
{ {
BufferManager& manager = BufferManager::instance(); BufferManager& manager = BufferManager::instance();
Buffer& buffer = parser.positional_count() == 0 ? context.buffer() : manager.get_buffer(parser[0]); Buffer& buffer = parser.positional_count() == 0 ? context.buffer() : manager.get_buffer(parser[0]);
@ -490,7 +490,7 @@ const CommandDesc namebuf_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
if (not context.buffer().set_name(parser[0])) if (not context.buffer().set_name(parser[0]))
throw runtime_error(format("unable to change buffer name to '{}'", parser[0])); throw runtime_error(format("unable to change buffer name to '{}'", parser[0]));
@ -585,7 +585,7 @@ const CommandDesc add_highlighter_cmd = {
return ""; return "";
}, },
add_highlighter_completer, add_highlighter_completer,
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
HighlighterRegistry& registry = HighlighterRegistry::instance(); HighlighterRegistry& registry = HighlighterRegistry::instance();
@ -616,7 +616,7 @@ const CommandDesc rm_highlighter_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
rm_highlighter_completer, rm_highlighter_completer,
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
StringView path = parser[0]; StringView path = parser[0];
auto sep_it = find(reversed(path), '/'); auto sep_it = find(reversed(path), '/');
@ -661,7 +661,7 @@ const CommandDesc add_hook_cmd = {
} }
return {}; return {};
}, },
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
Regex regex(parser[2].begin(), parser[2].end(), Regex regex(parser[2].begin(), parser[2].end(),
Regex::optimize | Regex::nosubs | Regex::ECMAScript); Regex::optimize | Regex::nosubs | Regex::ECMAScript);
@ -705,7 +705,7 @@ const CommandDesc rm_hook_cmd = {
} }
return {}; return {};
}, },
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
get_scope(parser[0], context).hooks().remove_hooks(parser[1]); get_scope(parser[0], context).hooks().remove_hooks(parser[1]);
} }
@ -719,7 +719,7 @@ Vector<String> params_to_shell(const ParametersParser& parser)
return vars; return vars;
} }
void define_command(const ParametersParser& parser, Context& context) void define_command(const ParametersParser& parser, Context& context, const ShellContext&)
{ {
const String& cmd_name = parser[0]; const String& cmd_name = parser[0];
auto& cm = CommandManager::instance(); auto& cm = CommandManager::instance();
@ -737,14 +737,14 @@ void define_command(const ParametersParser& parser, Context& context)
if (parser.get_switch("shell-params")) if (parser.get_switch("shell-params"))
{ {
desc = ParameterDesc{ {}, ParameterDesc::Flags::SwitchesAsPositional }; desc = ParameterDesc{ {}, ParameterDesc::Flags::SwitchesAsPositional };
cmd = [=](const ParametersParser& parser, Context& context) { cmd = [=](const ParametersParser& parser, Context& context, const ShellContext&) {
CommandManager::instance().execute(commands, context, { params_to_shell(parser) }); CommandManager::instance().execute(commands, context, { params_to_shell(parser) });
}; };
} }
else else
{ {
desc = ParameterDesc{ {}, ParameterDesc::Flags::SwitchesAsPositional, 0, 0 }; desc = ParameterDesc{ {}, ParameterDesc::Flags::SwitchesAsPositional, 0, 0 };
cmd = [=](const ParametersParser& parser, Context& context) { cmd = [=](const ParametersParser& parser, Context& context, const ShellContext&) {
CommandManager::instance().execute(commands, context); CommandManager::instance().execute(commands, context);
}; };
} }
@ -854,7 +854,7 @@ const CommandDesc alias_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
if (not CommandManager::instance().command_defined(parser[2])) if (not CommandManager::instance().command_defined(parser[2]))
throw runtime_error(format("Command '{}' does not exist", parser[2])); throw runtime_error(format("Command '{}' does not exist", parser[2]));
@ -873,7 +873,7 @@ const CommandDesc unalias_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
AliasRegistry& aliases = get_scope(parser[0], context).aliases(); AliasRegistry& aliases = get_scope(parser[0], context).aliases();
if (parser.positional_count() == 3 and if (parser.positional_count() == 3 and
@ -896,7 +896,7 @@ const CommandDesc echo_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
String message = join(parser, ' ', false); String message = join(parser, ' ', false);
if (parser.get_switch("debug")) if (parser.get_switch("debug"))
@ -926,7 +926,7 @@ const CommandDesc debug_cmd = {
auto c = {"info", "buffers", "options", "memory", "shared-strings"}; auto c = {"info", "buffers", "options", "memory", "shared-strings"};
return { 0_byte, cursor_pos, complete(prefix, cursor_pos, c) }; return { 0_byte, cursor_pos, complete(prefix, cursor_pos, c) };
} }), } }),
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
if (parser[0] == "info") if (parser[0] == "info")
{ {
@ -977,7 +977,7 @@ const CommandDesc source_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
filename_completer, filename_completer,
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
String file_content = read_file(parse_filename(parser[0]), true); String file_content = read_file(parse_filename(parser[0]), true);
try try
@ -1037,7 +1037,7 @@ const CommandDesc set_option_cmd = {
} }
return Completions{}; return Completions{};
}, },
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
Option& opt = get_scope(parser[0], context).options().get_local_option(parser[1]); Option& opt = get_scope(parser[0], context).options().get_local_option(parser[1]);
if (parser.get_switch("add")) if (parser.get_switch("add"))
@ -1068,7 +1068,7 @@ const CommandDesc unset_option_cmd = {
GlobalScope::instance().option_registry().complete_option_name(params[1], pos_in_token) }; GlobalScope::instance().option_registry().complete_option_name(params[1], pos_in_token) };
return Completions{}; return Completions{};
}, },
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
if (parser[0] == "global") if (parser[0] == "global")
throw runtime_error("Cannot unset options in global scope"); throw runtime_error("Cannot unset options in global scope");
@ -1098,7 +1098,7 @@ const CommandDesc declare_option_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
Option* opt = nullptr; Option* opt = nullptr;
@ -1176,7 +1176,7 @@ const CommandDesc map_key_cmd = {
} }
return {}; return {};
}, },
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
KeymapManager& keymaps = get_scope(parser[0], context).keymaps(); KeymapManager& keymaps = get_scope(parser[0], context).keymaps();
KeymapMode keymap_mode = parse_keymap_mode(parser[1]); KeymapMode keymap_mode = parse_keymap_mode(parser[1]);
@ -1316,7 +1316,7 @@ const CommandDesc exec_string_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
context_wrap(parser, context, [](const ParametersParser& parser, Context& context) { context_wrap(parser, context, [](const ParametersParser& parser, Context& context) {
KeyList keys; KeyList keys;
@ -1338,7 +1338,7 @@ const CommandDesc eval_string_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
context_wrap(parser, context, [](const ParametersParser& parser, Context& context) { context_wrap(parser, context, [](const ParametersParser& parser, Context& context) {
String command = join(parser, ' ', false); String command = join(parser, ' ', false);
@ -1359,7 +1359,7 @@ const CommandDesc prompt_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& params, Context& context) [](const ParametersParser& params, Context& context, const ShellContext&)
{ {
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");
@ -1393,7 +1393,7 @@ const CommandDesc menu_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
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");
@ -1439,7 +1439,7 @@ const CommandDesc onkey_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
String reg = parser[0]; String reg = parser[0];
String command = parser[1]; String command = parser[1];
@ -1464,7 +1464,7 @@ const CommandDesc info_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
context.ui().info_hide(); context.ui().info_hide();
if (parser.positional_count() > 0) if (parser.positional_count() > 0)
@ -1506,7 +1506,7 @@ const CommandDesc try_catch_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext& shell_context)
{ {
if (parser.positional_count() == 2) if (parser.positional_count() == 2)
throw wrong_argument_count(); throw wrong_argument_count();
@ -1518,12 +1518,12 @@ const CommandDesc try_catch_cmd = {
CommandManager& command_manager = CommandManager::instance(); CommandManager& command_manager = CommandManager::instance();
try try
{ {
command_manager.execute(parser[0], context); command_manager.execute(parser[0], context, shell_context);
} }
catch (Kakoune::runtime_error& e) catch (Kakoune::runtime_error& e)
{ {
if (do_catch) if (do_catch)
command_manager.execute(parser[2], context); command_manager.execute(parser[2], context, shell_context);
} }
} }
}; };
@ -1549,7 +1549,7 @@ const CommandDesc face_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
PerArgumentCommandCompleter({ complete_face, complete_face }), PerArgumentCommandCompleter({ complete_face, complete_face }),
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
FaceRegistry::instance().register_alias(parser[0], parser[1], true); FaceRegistry::instance().register_alias(parser[0], parser[1], true);
@ -1566,7 +1566,7 @@ const CommandDesc set_client_name_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
if (ClientManager::instance().validate_client_name(parser[0])) if (ClientManager::instance().validate_client_name(parser[0]))
context.set_name(parser[0]); context.set_name(parser[0]);
@ -1583,7 +1583,7 @@ const CommandDesc set_register_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
RegisterManager::instance()[parser[0]] = ConstArrayView<String>(parser[1]); RegisterManager::instance()[parser[0]] = ConstArrayView<String>(parser[1]);
} }
@ -1597,7 +1597,7 @@ const CommandDesc select_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
CommandCompleter{}, CommandCompleter{},
[](const ParametersParser& parser, Context& context) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
context.selections_write_only() = selection_list_from_string(context.buffer(), parser[0]); context.selections_write_only() = selection_list_from_string(context.buffer(), parser[0]);
} }
@ -1611,7 +1611,7 @@ const CommandDesc change_working_directory_cmd = {
CommandFlags::None, CommandFlags::None,
CommandHelper{}, CommandHelper{},
filename_completer, filename_completer,
[](const ParametersParser& parser, Context&) [](const ParametersParser& parser, Context&, const ShellContext&)
{ {
if (chdir(parse_filename(parser[0]).c_str()) != 0) if (chdir(parse_filename(parser[0]).c_str()) != 0)
throw runtime_error(format("cannot change to directory '{}'", parser[0])); throw runtime_error(format("cannot change to directory '{}'", parser[0]));
@ -1652,7 +1652,7 @@ void exec_keys(ConstArrayView<Key> keys, Context& context)
void register_commands() void register_commands()
{ {
CommandManager& cm = CommandManager::instance(); CommandManager& cm = CommandManager::instance();
cm.register_command("nop", [](const ParametersParser&, Context&){}, "do nothing", {}); cm.register_command("nop", [](const ParametersParser&, Context&, const ShellContext&){}, "do nothing", {});
auto register_command = [&](const CommandDesc& c) auto register_command = [&](const CommandDesc& c)
{ {