diff options
| author | Justin Frank <justinpfrank@protonmail.com> | 2019-02-08 20:41:09 -0800 |
|---|---|---|
| committer | Justin Frank <justinpfrank@protonmail.com> | 2019-02-27 22:45:31 -0800 |
| commit | 8178400f8dc70aaa5dcbef16f92e50c53d8dc8c1 (patch) | |
| tree | e7834427a9ba22ef92a9d8a8c83241850b33302e /src/input_handler.cc | |
| parent | 29342836a6b60f46a0f5c4c938a8cd99e2e033ea (diff) | |
Fixed all reorder warnings
Diffstat (limited to 'src/input_handler.cc')
| -rw-r--r-- | src/input_handler.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc index 91acbc3f..78363241 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -752,9 +752,10 @@ public: Prompt(InputHandler& input_handler, StringView prompt, String initstr, String emptystr, Face face, PromptFlags flags, PromptCompleter completer, PromptCallback callback) - : InputMode(input_handler), m_prompt(prompt.str()), m_prompt_face(face), + : InputMode(input_handler), m_callback(std::move(callback)), m_completer(std::move(completer)), + m_prompt(prompt.str()), m_prompt_face(face), m_empty_text{std::move(emptystr)}, - m_flags(flags), m_completer(std::move(completer)), m_callback(std::move(callback)), + m_line_editor{context().faces()}, m_flags(flags), m_auto_complete{context().options()["autocomplete"].get<AutoComplete>() & AutoComplete::Prompt}, m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Draft ? Timer::Callback{} : [this](Timer&) { @@ -766,8 +767,7 @@ public: m_line_changed = false; } context().hooks().run_hook(Hook::PromptIdle, "", context()); - }}, - m_line_editor{context().faces()} + }} { m_history_it = ms_history[m_prompt].end(); m_line_editor.reset(std::move(initstr), m_empty_text); @@ -1102,7 +1102,7 @@ class NextKey : public InputMode { public: NextKey(InputHandler& input_handler, KeymapMode keymap_mode, KeyCallback callback) - : InputMode(input_handler), m_keymap_mode(keymap_mode), m_callback(std::move(callback)) {} + : InputMode(input_handler), m_callback(std::move(callback)), m_keymap_mode(keymap_mode) {} void on_key(Key key) override { @@ -1132,16 +1132,16 @@ class Insert : public InputMode public: Insert(InputHandler& input_handler, InsertMode mode, int count) : InputMode(input_handler), - m_restore_cursor(mode == InsertMode::Append), m_edition(context()), m_completer(context()), + m_restore_cursor(mode == InsertMode::Append), m_auto_complete{context().options()["autocomplete"].get<AutoComplete>() & AutoComplete::Insert}, - m_disable_hooks{context().hooks_disabled(), context().hooks_disabled()}, m_idle_timer{TimePoint::max(), context().flags() & Context::Flags::Draft ? Timer::Callback{} : [this](Timer&) { m_completer.update(m_auto_complete); context().hooks().run_hook(Hook::InsertIdle, "", context()); - }} + }}, + m_disable_hooks{context().hooks_disabled(), context().hooks_disabled()} { context().buffer().throw_if_read_only(); |
