Skip to content

Add config options related to Vi input mode #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 6, 2020
Merged

Add config options related to Vi input mode #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30d72ec
Add config options related to Vi input mode
antonalekseev Feb 4, 2020
295f3a8
Renamed repl.vi_start_in_nav_mode to repl.vi_start_in_navigation_mode.
jonathanslenders Aug 6, 2020
180462b
Fix: no need to handle vi_start_in_navigation_mode in the embed() call.
jonathanslenders Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions examples/ptpython_config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ def configure(repl):
# Syntax.
repl.enable_syntax_highlighting = True

# Get into Vi navigation mode at startup
repl.vi_start_in_navigation_mode = False

# Preserve last used Vi input mode between main loop iterations
repl.vi_keep_last_used_mode = False

# Install custom colorscheme named 'my-colorscheme' and use it.
"""
repl.install_ui_colorscheme('my-colorscheme', Style.from_dict(_custom_ui_colorscheme))
Expand Down
6 changes: 6 additions & 0 deletions ptpython/python_input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,12 @@ def __init__(
# (Never run more than one at the same time.)
self._get_signatures_thread_running: bool = False

# Get into Vi navigation mode at startup
self.vi_start_in_navigation_mode: bool = False

# Preserve last used Vi input mode between main loop iterations
self.vi_keep_last_used_mode: bool = False

self.style_transformation = merge_style_transformations(
[
ConditionalStyleTransformation(
Expand Down
16 changes: 15 additions & 1 deletion ptpython/repl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
merge_formatted_text,
to_formatted_text,
)
from prompt_toolkit.formatted_text.utils import fragment_list_width
from prompt_toolkit.key_binding.vi_state import InputMode
from prompt_toolkit.patch_stdout import patch_stdout as patch_stdout_context
from prompt_toolkit.shortcuts import clear_title, print_formatted_text, set_title
from prompt_toolkit.utils import DummyContext
Expand Down Expand Up @@ -79,9 +81,21 @@ async def run_async(self) -> None:
set_title(self.terminal_title)

while True:
# Capture the current input_mode in order to restore it after reset,
# for ViState.reset() sets it to InputMode.INSERT unconditionally and
# doesn't accept any arguments.
def pre_run(
last_input_mode: InputMode = self.app.vi_state.input_mode,
) -> None:
if self.vi_keep_last_used_mode:
self.app.vi_state.input_mode = last_input_mode

if not self.vi_keep_last_used_mode and self.vi_start_in_navigation_mode:
self.app.vi_state.input_mode = InputMode.NAVIGATION

# Run the UI.
try:
text = await self.app.run_async()
text = await self.app.run_async(pre_run=pre_run)
except EOFError:
return
except KeyboardInterrupt:
Expand Down