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

Fail "define-command -menu" unless a completer is given

Browse Source 
The "define-command -menu" flag does not do anything unless there is
a completer flag.  Let's reject it.
This commit is contained in:
Johannes Altmanninger 2024-03-12 20:42:56 +01:00 committed by Maxime Coste
parent 4d8de48ec3
commit bdca6760fe
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/commands.cc
View File

@ -1347,7 +1347,8 @@ void define_command(const ParametersParser& parser, Context& context, const Shel
if (parser.get_switch("hidden")) if (parser.get_switch("hidden"))
flags = CommandFlags::Hidden; flags = CommandFlags::Hidden;
const Completions::Flags completions_flags = parser.get_switch("menu") ? const bool menu = (bool)parser.get_switch("menu");
const Completions::Flags completions_flags = menu ?
Completions::Flags::Menu : Completions::Flags::None; Completions::Flags::Menu : Completions::Flags::None;
const String& commands = parser[1]; const String& commands = parser[1];
@ -1384,6 +1385,8 @@ void define_command(const ParametersParser& parser, Context& context, const Shel
} }
CommandCompleter completer = parse_completion_switch(parser, completions_flags); CommandCompleter completer = parse_completion_switch(parser, completions_flags);
if (menu and not completer)
throw runtime_error("menu switch requires a completion switch");
auto docstring = trim_indent(parser.get_switch("docstring").value_or(StringView{})); auto docstring = trim_indent(parser.get_switch("docstring").value_or(StringView{}));
cm.register_command(cmd_name, cmd, docstring, desc, flags, CommandHelper{}, std::move(completer)); cm.register_command(cmd_name, cmd, docstring, desc, flags, CommandHelper{}, std::move(completer));