From 05a74d67dec697550fcd387386da19a3de2ef55a Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Mon, 10 Jun 2024 21:16:33 -0700 Subject: [PATCH] finished --vim --- aider/args.py | 1 + aider/io.py | 7 +++++-- aider/main.py | 3 +-- website/docs/commands.md | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/aider/args.py b/aider/args.py index c6aeda37e..389de7435 100644 --- a/aider/args.py +++ b/aider/args.py @@ -26,6 +26,7 @@ def get_parser(default_config_files, git_root): help="Use VI editing mode in the terminal (default: False)", default=False, ) + group.add_argument( "files", metavar="FILE", nargs="*", diff --git a/aider/io.py b/aider/io.py index 614445e33..65093332c 100644 --- a/aider/io.py +++ b/aider/io.py @@ -5,10 +5,11 @@ from datetime import datetime from pathlib import Path from prompt_toolkit.completion import Completer, Completion +from prompt_toolkit.enums import EditingMode from prompt_toolkit.history import FileHistory from prompt_toolkit.key_binding import KeyBindings from prompt_toolkit.lexers import PygmentsLexer -from prompt_toolkit.shortcuts import CompleteStyle, PromptSession, prompt, EditingMode +from prompt_toolkit.shortcuts import CompleteStyle, PromptSession, prompt from prompt_toolkit.styles import Style from pygments.lexers import MarkdownLexer, guess_lexer_for_filename from pygments.token import Token @@ -236,7 +237,9 @@ class InputOutput: def _(event): event.current_buffer.insert_text("\n") - session = PromptSession(key_bindings=kb, editing_mode=self.editingmode, **session_kwargs) + session = PromptSession( + key_bindings=kb, editing_mode=self.editingmode, **session_kwargs + ) line = session.prompt() if line and line[0] == "{" and not multiline_input: diff --git a/aider/main.py b/aider/main.py index af36f8925..31b3f0ce3 100644 --- a/aider/main.py +++ b/aider/main.py @@ -6,6 +6,7 @@ from pathlib import Path import git from dotenv import load_dotenv +from prompt_toolkit.enums import EditingMode from streamlit.web import cli from aider import __version__, models, utils @@ -13,8 +14,6 @@ from aider.args import get_parser from aider.coders import Coder from aider.commands import SwitchModel from aider.io import InputOutput -from prompt_toolkit.shortcuts import EditingMode -from prompt_toolkit.shortcuts import EditingMode from aider.litellm import litellm # noqa: F401; properly init litellm on launch from aider.repo import GitRepo from aider.versioncheck import check_version diff --git a/website/docs/commands.md b/website/docs/commands.md index 59e912564..e83726e39 100644 --- a/website/docs/commands.md +++ b/website/docs/commands.md @@ -73,5 +73,5 @@ The interactive prompt is built with [prompt-toolkit](https://github.com/prompt- - `dd` : Delete the current line. - `u` : Undo the last change. - `Ctrl-R` : Redo the last undone change. -- `:` : Enter command mode for ex commands (e.g., `:w` to save). +