diagrams

src/argenta/app/autocompleter/entity.py

@@ -5,7 +5,7 @@ from typing import Callable, Iterable
 
 from prompt_toolkit import PromptSession, HTML
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
-from prompt_toolkit.completion import Completer, Completion, CompleteEvent
+from prompt_toolkit.completion import Completer, Completion, CompleteEvent, ThreadedCompleter
 from prompt_toolkit.document import Document
 from prompt_toolkit.formatted_text import StyleAndTextTuples
 from prompt_toolkit.history import History, ThreadedHistory, FileHistory, InMemoryHistory
@@ -97,34 +97,36 @@ class AutoCompleter:
 
         def _(event: KeyPressEvent) -> None:
             buff = event.app.current_buffer
-
             if buff.complete_state:
                 buff.complete_next()
-            else:
-                completions = list(buff.completer.get_completions(buff.document, CompleteEvent()))
-                if len(completions) == 1:
-                    buff.apply_completion(completions[0])
-                else:
-                    buff.start_completion(select_first=False)
+                return
+            comps_gen = buff.completer.get_completions(buff.document, CompleteEvent())
+            try:
+                first = next(comps_gen)
+            except StopIteration:
+                return
+            try:
+                _ = next(comps_gen)
+                buff.start_completion(select_first=False)
+            except StopIteration:
+                buff.apply_completion(first)
 
         kb.add(self.autocomplete_button)(_)
 
         history: InMemoryHistory | ThreadedHistory
-
         if self.history_filename:
             history = ThreadedHistory(FileHistory(self.history_filename))
         else:
             history = InMemoryHistory()
 
         style = Style.from_dict({'valid': '#00ff00', 'invalid': '#ff0000'})
-
         self._session = PromptSession(
             history=history,
-            completer=HistoryCompleter(history, all_commands),
+            completer=ThreadedCompleter(HistoryCompleter(history, all_commands)),
             complete_while_typing=False,
             key_bindings=kb,
             auto_suggest=AutoSuggestFromHistory() if self.auto_suggestions else None,
-            style=style if self.command_highlighting else style,
+            style=style if self.command_highlighting else None,
             lexer=CommandLexer(all_commands) if self.command_highlighting else None,
         )
 

src/argenta/app/models.py

@@ -147,7 +147,7 @@ class BaseApp:
         :return: None
         """
         for registered_router in self.registered_routers:
-            self._print_func(registered_router.title)
+            self._print_func('\n'+registered_router.title)
             for command_handler in registered_router.command_handlers:
                 handled_command = command_handler.handled_command
                 self._print_func(
@@ -156,7 +156,6 @@ class BaseApp:
                         handled_command.description,
                     )
                 )
-            self._print_func("")
 
     def _print_framed_text(self, text: str) -> None:
         """
@@ -308,9 +307,9 @@ class BaseApp:
         Private. Sets up default app view
         :return: None
         """
-        self._prompt = f"<gray><b>{self._prompt}</b></gray>"
+        self._prompt = f"\n<gray><b>{self._prompt}</b></gray>"
         self._initial_message = (
-            "\n" + f"[bold red]{text2art(self._initial_message, font='tarty1')}" + "\n"
+            "\n" + f"[bold red]{text2art(self._initial_message, font='tarty1')}"
         )
         self._farewell_message = (
             "[bold red]\n\n"
@@ -443,6 +442,7 @@ class App(BaseApp):
                 self._print_command_group_description()
 
             raw_command: str = self._autocompleter.prompt(self._prompt)
+            print() # post-prompt gap
 
             try:
                 input_command: InputCommand = InputCommand.parse(raw_command=raw_command)