good-enough solutions

thomasballinger · sebastinas · commit 7d4f80d6a375 · 2022-05-03T00:27:41.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1101,7 +1101,12 @@ def print_line(
 
         if self.highlighted_paren is not None:
             # Clear previous highlighted paren
-            self.reprint_line(*self.highlighted_paren)
+
+            lineno = self.highlighted_paren[0]
+            tokens = self.highlighted_paren[1]
+            # mypy thinks tokens is List[Tuple[_TokenType, str]]
+            # but it is supposed to be MutableMapping[_TokenType, str]
+            self.reprint_line(lineno, tokens)
             self.highlighted_paren = None
 
         if self.config.syntax and (not self.paste_mode or newline):
@@ -1221,7 +1226,7 @@ def repl(self) -> Tuple[Any, ...]:
         return self.exit_value
 
     def reprint_line(
-        self, lineno: int, tokens: MutableMapping[_TokenType, str]
+        self, lineno: int, tokens: List[Tuple[_TokenType, str]]
     ) -> None:
         """Helper function for paren highlighting: Reprint line at offset
         `lineno` in current input buffer."""
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -13,9 +13,12 @@
 import unicodedata
 from enum import Enum
 from types import TracebackType
-from typing import Dict, Any, List, Optional, Tuple, Union, cast, Type
+from typing import Dict, Any, List, Optional, Tuple, Union, cast, Type, TYPE_CHECKING
 from .._typing_compat import Literal
 
+if TYPE_CHECKING:
+    from ..repl import Interpreter
+
 import blessings
 import greenlet
 from curtsies import (
@@ -357,7 +360,9 @@ def __init__(
         )
         self.edit_keys = edit_keys.mapping_with_config(config, key_dispatch)
         logger.debug("starting parent init")
-        super().__init__(interp, config)
+        # interp is a subclass of repl.Interpreter, so it definitely,
+        # implements the methods of Interpreter!
+        super().__init__(cast('Interpreter', interp), config)
 
         self.formatter = BPythonFormatter(config.color_scheme)
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -48,6 +48,7 @@
     MutableMapping,
     Callable,
     Dict,
+    TYPE_CHECKING,
 )
 from ._typing_compat import Literal
 
@@ -61,7 +62,10 @@
     have_pyperclip = False
 
 from . import autocomplete, inspection, simpleeval
-from .cli import Statusbar
+
+if TYPE_CHECKING:
+    from .cli import Statusbar
+
 from .config import getpreferredencoding, Config
 from .formatter import Parenthesis
 from .history import History
@@ -365,7 +369,7 @@ def clear(self) -> None:
 
 
 class Interaction:
-    def __init__(self, config: Config, statusbar: Optional[Statusbar] = None):
+    def __init__(self, config: Config, statusbar: Optional['Statusbar'] = None):
         self.config = config
 
         if statusbar:
@@ -418,14 +422,36 @@ class Repl:
     XXX Subclasses should implement echo, current_line, cw
     """
 
+    @abstractmethod
+    @property
+    def current_line(self):
+        pass
+
+    @abstractmethod
+    @property
+    def cursor_offset(self):
+        pass
+
+    @abstractmethod
+    def reevaluate(self):
+        pass
+
+    @abstractmethod
+    def reprint_line(
+        self, lineno: int, tokens: List[Tuple[_TokenType, str]]
+    ) -> None:
+        pass
+
+    # not actually defined, subclasses must define
+    cpos: int
+
     def __init__(self, interp: Interpreter, config: Config):
         """Initialise the repl.
 
         interp is a Python code.InteractiveInterpreter instance
 
         config is a populated bpython.config.Struct.
         """
-
         self.config = config
         self.cut_buffer = ""
         self.buffer: List[str] = []
