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

Rename "disable_history" stack state to "noninteractive"

Browse Source 
The commit after next will fix a bug where we wrongly disable prompt
history in some scenarios. The root cause is that life span of
"disable_history" does not model when we actually want to disable
history.

Let's rename the state variable to "noninteractive". It's set whenever
we are executing a hook, mapping or command.

Note that it's also active inside ":prompt"'s callback, which doesn't
play well with the new name :(
This commit is contained in:
Johannes Altmanninger 2022-07-31 20:48:38 +02:00
parent 7027cccf82
commit 00490cd084
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands.cc
View File

@ -1993,7 +1993,7 @@ void context_wrap(const ParametersParser& parser, Context& context, StringView d
Context::Flags::Draft}; Context::Flags::Draft};
Context& c = input_handler.context(); Context& c = input_handler.context();
ScopedSetBool disable_history(c.history_disabled()); ScopedSetBool noninteractive(c.noninteractive());
func(parser, c); func(parser, c);
}; };
@ -2044,7 +2044,7 @@ void context_wrap(const ParametersParser& parser, Context& context, StringView d
Context& c = *effective_context; Context& c = *effective_context;
ScopedSetBool disable_history(c.history_disabled()); ScopedSetBool noninteractive(c.noninteractive());
ScopedEdition edition{c}; ScopedEdition edition{c};
ScopedSelectionEdition selection_edition{c}; ScopedSelectionEdition selection_edition{c};
@ -2222,7 +2222,7 @@ const CommandDesc prompt_cmd = {
sc.env_vars.erase("text"_sv); sc.env_vars.erase("text"_sv);
}); });
ScopedSetBool disable_history{context.history_disabled()}; ScopedSetBool noninteractive{context.noninteractive()};
StringView cmd; StringView cmd;
switch (event) switch (event)
@ -2269,7 +2269,7 @@ const CommandDesc menu_cmd = {
if (count == modulo and parser.get_switch("auto-single")) if (count == modulo and parser.get_switch("auto-single"))
{ {
ScopedSetBool disable_history{context.history_disabled()}; ScopedSetBool noninteractive{context.noninteractive()};
CommandManager::instance().execute(parser[1], context); CommandManager::instance().execute(parser[1], context);
return; return;
@ -2293,7 +2293,7 @@ const CommandDesc menu_cmd = {
CapturedShellContext sc{shell_context}; CapturedShellContext sc{shell_context};
context.input_handler().menu(std::move(choices), context.input_handler().menu(std::move(choices),
[=](int choice, MenuEvent event, Context& context) { [=](int choice, MenuEvent event, Context& context) {
ScopedSetBool disable_history{context.history_disabled()}; ScopedSetBool noninteractive{context.noninteractive()};
if (event == MenuEvent::Validate and choice >= 0 and choice < commands.size()) if (event == MenuEvent::Validate and choice >= 0 and choice < commands.size())
CommandManager::instance().execute(commands[choice], context, sc); CommandManager::instance().execute(commands[choice], context, sc);
@ -2324,7 +2324,7 @@ const CommandDesc on_key_cmd = {
parser.get_switch("mode-name").value_or("on-key"), parser.get_switch("mode-name").value_or("on-key"),
KeymapMode::None, [=](Key key, Context& context) mutable { KeymapMode::None, [=](Key key, Context& context) mutable {
sc.env_vars["key"_sv] = to_string(key); sc.env_vars["key"_sv] = to_string(key);
ScopedSetBool disable_history{context.history_disabled()}; ScopedSetBool noninteractive{context.noninteractive()};
CommandManager::instance().execute(command, context, sc); CommandManager::instance().execute(command, context, sc);
}); });
@ -2646,7 +2646,7 @@ void enter_user_mode(Context& context, String mode_name, KeymapMode mode, bool l
return; return;
ScopedSetBool disable_keymaps(context.keymaps_disabled()); ScopedSetBool disable_keymaps(context.keymaps_disabled());
ScopedSetBool disable_history(context.history_disabled()); ScopedSetBool noninteractive(context.noninteractive());
InputHandler::ScopedForceNormal force_normal{context.input_handler(), {}}; InputHandler::ScopedForceNormal force_normal{context.input_handler(), {}};

6
src/context.hh
View File

@ -126,8 +126,8 @@ public:
NestedBool& keymaps_disabled() { return m_keymaps_disabled; } NestedBool& keymaps_disabled() { return m_keymaps_disabled; }
const NestedBool& keymaps_disabled() const { return m_keymaps_disabled; } const NestedBool& keymaps_disabled() const { return m_keymaps_disabled; }
NestedBool& history_disabled() { return m_history_disabled; } NestedBool& noninteractive() { return m_noninteractive; }
const NestedBool& history_disabled() const { return m_history_disabled; } const NestedBool& noninteractive() const { return m_noninteractive; }
Flags flags() const { return m_flags; } Flags flags() const { return m_flags; }
@ -207,7 +207,7 @@ private:
NestedBool m_hooks_disabled; NestedBool m_hooks_disabled;
NestedBool m_keymaps_disabled; NestedBool m_keymaps_disabled;
NestedBool m_history_disabled; NestedBool m_noninteractive;
}; };
struct ScopedEdition struct ScopedEdition

2
src/hook_manager.cc
View File

@ -37,7 +37,7 @@ struct HookManager::HookData
enum_desc(Meta::Type<Hook>{})[to_underlying(hook)].name, enum_desc(Meta::Type<Hook>{})[to_underlying(hook)].name,
param, group)); param, group));
ScopedSetBool disable_history{context.history_disabled()}; ScopedSetBool noninteractive{context.noninteractive()};
EnvVarMap env_vars{ {"hook_param", param.str()} }; EnvVarMap env_vars{ {"hook_param", param.str()} };
for (size_t i = 0; i < captures.size(); ++i) for (size_t i = 0; i < captures.size(); ++i)

4
src/input_handler.cc
View File

@ -1197,7 +1197,7 @@ private:
void history_push(StringView entry) void history_push(StringView entry)
{ {
if (entry.empty() or context().history_disabled() or if (entry.empty() or context().noninteractive() or
(m_flags & PromptFlags::DropHistoryEntriesWithBlankPrefix and (m_flags & PromptFlags::DropHistoryEntriesWithBlankPrefix and
is_horizontal_blank(entry[0_byte]))) is_horizontal_blank(entry[0_byte])))
return; return;
@ -1772,7 +1772,7 @@ void InputHandler::handle_key(Key key)
KeymapManager& keymaps = m_context.keymaps(); KeymapManager& keymaps = m_context.keymaps();
if (keymaps.is_mapped(key, keymap_mode) and not m_context.keymaps_disabled()) if (keymaps.is_mapped(key, keymap_mode) and not m_context.keymaps_disabled())
{ {
ScopedSetBool disable_history{context().history_disabled()}; ScopedSetBool noninteractive{context().noninteractive()};
for (auto& k : keymaps.get_mapping_keys(key, keymap_mode)) for (auto& k : keymaps.get_mapping_keys(key, keymap_mode))
process_key(k); process_key(k);

8
src/normal.cc
View File

@ -1016,7 +1016,7 @@ void select_regex(Context& context, NormalParams params)
RegisterManager::instance()[reg].restore(context, saved_reg); RegisterManager::instance()[reg].restore(context, saved_reg);
if (event == PromptEvent::Abort) if (event == PromptEvent::Abort)
return; return;
if (not context.history_disabled()) if (not context.noninteractive())
RegisterManager::instance()[reg].set(context, ex.str()); RegisterManager::instance()[reg].set(context, ex.str());
auto& selections = context.selections(); auto& selections = context.selections();
@ -1038,7 +1038,7 @@ void split_regex(Context& context, NormalParams params)
RegisterManager::instance()[reg].restore(context, saved_reg); RegisterManager::instance()[reg].restore(context, saved_reg);
if (event == PromptEvent::Abort) if (event == PromptEvent::Abort)
return; return;
if (not context.history_disabled()) if (not context.noninteractive())
RegisterManager::instance()[reg].set(context, ex.str()); RegisterManager::instance()[reg].set(context, ex.str());
auto& selections = context.selections(); auto& selections = context.selections();
@ -1142,7 +1142,7 @@ void keep(Context& context, NormalParams params)
RegisterManager::instance()[reg].restore(context, saved_reg); RegisterManager::instance()[reg].restore(context, saved_reg);
if (event == PromptEvent::Abort) if (event == PromptEvent::Abort)
return; return;
if (not context.history_disabled()) if (not context.noninteractive())
RegisterManager::instance()[reg].set(context, regex.str()); RegisterManager::instance()[reg].set(context, regex.str());
if (regex.empty() or regex.str().empty()) if (regex.empty() or regex.str().empty())
@ -2049,7 +2049,7 @@ void exec_user_mappings(Context& context, NormalParams params)
return; return;
ScopedSetBool disable_keymaps(context.keymaps_disabled()); ScopedSetBool disable_keymaps(context.keymaps_disabled());
ScopedSetBool disable_history(context.history_disabled()); ScopedSetBool noninteractive(context.noninteractive());
InputHandler::ScopedForceNormal force_normal{context.input_handler(), params}; InputHandler::ScopedForceNormal force_normal{context.input_handler(), params};