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

Merge remote-tracking branch 'krobelus/set-remove-autoinfo'

Browse Source
This commit is contained in:
Maxime Coste 2022-08-21 18:38:28 +02:00
commit 13a95b0ba0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/commands.cc
View File

@ -1617,11 +1617,11 @@ const CommandDesc source_cmd = {
static String option_doc_helper(const Context& context, CommandParameters params) static String option_doc_helper(const Context& context, CommandParameters params)
{ {
const bool add = params.size() > 1 and params[0] == "-add"; const bool is_switch = params.size() > 1 and (params[0] == "-add" or params[0] == "-remove");
if (params.size() < 2 + (add ? 1 : 0)) if (params.size() < 2 + (is_switch ? 1 : 0))
return ""; return "";
auto desc = GlobalScope::instance().option_registry().option_desc(params[1 + (add ? 1 : 0)]); auto desc = GlobalScope::instance().option_registry().option_desc(params[1 + (is_switch ? 1 : 0)]);
if (not desc or desc->docstring().empty()) if (not desc or desc->docstring().empty())
return ""; return "";
@ -1652,9 +1652,6 @@ const CommandDesc set_option_cmd = {
CommandParameters params, size_t token_to_complete, CommandParameters params, size_t token_to_complete,
ByteCount pos_in_token) -> Completions ByteCount pos_in_token) -> Completions
{ {
const bool add = params.size() > 1 and params[0] == "-add";
const int start = add ? 1 : 0;
static constexpr auto scopes = { "global", "buffer", "window", "current" }; static constexpr auto scopes = { "global", "buffer", "window", "current" };
if (token_to_complete == 0) if (token_to_complete == 0)
@ -1666,7 +1663,7 @@ const CommandDesc set_option_cmd = {
else if (token_to_complete == 2 and params[2].empty() and else if (token_to_complete == 2 and params[2].empty() and
GlobalScope::instance().option_registry().option_exists(params[1])) GlobalScope::instance().option_registry().option_exists(params[1]))
{ {
OptionManager& options = get_scope(params[start], context).options(); OptionManager& options = get_scope(params[0], context).options();
return {0_byte, params[2].length(), return {0_byte, params[2].length(),
{options[params[1]].get_as_string(Quoting::Kakoune)}, {options[params[1]].get_as_string(Quoting::Kakoune)},
Completions::Flags::Quoted}; Completions::Flags::Quoted};