Add an unset command to remove an option value (falling back to parent)

unset is not applicable to global scope.
This commit is contained in:
Maxime Coste 2015-08-10 13:54:52 +01:00
parent 10d8cf64cf
commit 94ec1cdde7
3 changed files with 56 additions and 11 deletions

View File

@ -977,6 +977,18 @@ const CommandDesc source_cmd = {
} }
}; };
static String option_doc_helper(const Context& context, CommandParameters params)
{
if (params.size() < 2)
return "";
auto desc = GlobalScope::instance().option_registry().option_desc(params[1]);
if (not desc or desc->docstring().empty())
return "";
return format("{}: {}", desc->name(), desc->docstring());
}
const CommandDesc set_option_cmd = { const CommandDesc set_option_cmd = {
"set", "set",
nullptr, nullptr,
@ -986,17 +998,7 @@ const CommandDesc set_option_cmd = {
ParameterDesc::Flags::SwitchesOnlyAtStart, 3, 3 ParameterDesc::Flags::SwitchesOnlyAtStart, 3, 3
}, },
CommandFlags::None, CommandFlags::None,
[](const Context& context, CommandParameters params) -> String option_doc_helper,
{
if (params.size() < 2)
return "";
auto desc = GlobalScope::instance().option_registry().option_desc(params[1]);
if (not desc or desc->docstring().empty())
return "";
return format("{}: {}", desc->name(), desc->docstring());
},
[](const Context& context, CompletionFlags, [](const Context& context, CompletionFlags,
CommandParameters params, size_t token_to_complete, CommandParameters params, size_t token_to_complete,
ByteCount pos_in_token) -> Completions ByteCount pos_in_token) -> Completions
@ -1027,6 +1029,36 @@ const CommandDesc set_option_cmd = {
} }
}; };
const CommandDesc unset_option_cmd = {
"unset",
nullptr,
"unset <scope> <name>: remove <name> option from scope, falling back on parent scope value",
ParameterDesc{ {}, ParameterDesc::Flags::None, 2, 2 },
CommandFlags::None,
option_doc_helper,
[](const Context& context, CompletionFlags,
CommandParameters params, size_t token_to_complete,
ByteCount pos_in_token) -> Completions
{
if (token_to_complete == 0)
{
constexpr auto scopes = { "buffer", "window" };
return { 0_byte, params[0].length(), complete(params[0], pos_in_token, scopes) };
}
else if (token_to_complete == 1)
return { 0_byte, params[1].length(),
GlobalScope::instance().option_registry().complete_option_name(params[1], pos_in_token) };
return Completions{};
},
[](const ParametersParser& parser, Context& context)
{
if (parser[0] == "global")
throw runtime_error("Cannot unset options in global scope");
get_scope(parser[0], context).options().unset_option(parser[1]);
}
};
const CommandDesc declare_option_cmd = { const CommandDesc declare_option_cmd = {
"decl", "decl",
nullptr, nullptr,
@ -1634,6 +1666,7 @@ void register_commands()
register_command(debug_cmd); register_command(debug_cmd);
register_command(source_cmd); register_command(source_cmd);
register_command(set_option_cmd); register_command(set_option_cmd);
register_command(unset_option_cmd);
register_command(declare_option_cmd); register_command(declare_option_cmd);
register_command(map_key_cmd); register_command(map_key_cmd);
register_command(exec_string_cmd); register_command(exec_string_cmd);

View File

@ -76,6 +76,17 @@ const Option& OptionManager::operator[](StringView name) const
return const_cast<OptionManager&>(*this)[name]; return const_cast<OptionManager&>(*this)[name];
} }
void OptionManager::unset_option(StringView name)
{
kak_assert(m_parent); // cannot unset option on global manager
auto it = find_option(m_options, name);
if (it != m_options.end())
{
m_options.erase(it);
on_option_changed((*m_parent)[name]);
}
}
OptionManager::OptionList OptionManager::flatten_options() const OptionManager::OptionList OptionManager::flatten_options() const
{ {
OptionList res = m_parent ? m_parent->flatten_options() : OptionList{}; OptionList res = m_parent ? m_parent->flatten_options() : OptionList{};

View File

@ -83,6 +83,7 @@ public:
const Option& operator[] (StringView name) const; const Option& operator[] (StringView name) const;
Option& get_local_option(StringView name); Option& get_local_option(StringView name);
void unset_option(StringView name);
using OptionList = Vector<const Option*>; using OptionList = Vector<const Option*>;
OptionList flatten_options() const; OptionList flatten_options() const;