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

Add missing hooks to completion list and validate hook name in hook cmd

Browse Source
This commit is contained in:
Maxime Coste 2016-11-21 09:51:47 +00:00
parent be03fdce2a
commit 0b806cd4f1
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/commands.cc
View File

@ -746,17 +746,19 @@ const CommandDesc remove_highlighter_cmd = {
} }
}; };
static constexpr auto hooks = {
"BufCreate", "BufNew", "BufOpen", "BufClose", "BufWritePost", "BufWritePre",
"BufOpenFifo", "BufCloseFifo", "BufReadFifo", "BufSetOption",
"InsertBegin", "InsertChar", "InsertEnd", "InsertIdle", "InsertKey",
"InsertMove", "InsertCompletionHide", "InsertCompletionShow",
"KakBegin", "KakEnd", "FocusIn", "FocusOut", "RuntimeError",
"NormalBegin", "NormalEnd", "NormalIdle", "NormalKey",
"WinClose", "WinCreate", "WinDisplay", "WinResize", "WinSetOption",
};
static Completions complete_hooks(const Context&, CompletionFlags, static Completions complete_hooks(const Context&, CompletionFlags,
const String& prefix, ByteCount cursor_pos) const String& prefix, ByteCount cursor_pos)
{ {
static constexpr auto hooks = {
"BufWritePost", "BufWritePre", "FocusIn", "FocusOut",
"InsertBegin", "InsertChar", "InsertEnd", "InsertIdle",
"InsertKey", "InsertMove", "KakBegin", "KakEnd",
"InsertCompletionHide", "InsertCompletionShow",
"NormalBegin", "NormalEnd", "NormalIdle", "NormalKey",
"RuntimeError", "WinDisplay",
};
return { 0_byte, cursor_pos, complete(prefix, cursor_pos, hooks) }; return { 0_byte, cursor_pos, complete(prefix, cursor_pos, hooks) };
} }
@ -783,6 +785,9 @@ const CommandDesc add_hook_cmd = {
context, flags, prefix, cursor_pos); }), context, flags, prefix, cursor_pos); }),
[](const ParametersParser& parser, Context& context, const ShellContext&) [](const ParametersParser& parser, Context& context, const ShellContext&)
{ {
if (not contains(hooks, parser[1]))
throw runtime_error{format("Unknown hook '{}'", parser[1])};
Regex regex(parser[2], Regex::optimize | Regex::nosubs | Regex::ECMAScript); Regex regex(parser[2], Regex::optimize | Regex::nosubs | Regex::ECMAScript);
const String& command = parser[3]; const String& command = parser[3];