Refactor/backend

thonnycontrib/backend/py5_imported_mode_backend.py

@@ -1,64 +1,53 @@
 '''thonny-py5mode backend
-   interacts with thonny-py5mode frontend (thonny-py5mode > __init__.py)
-'''
+   interacts with thonny-py5mode frontend (thonny-py5mode > __init__.py)'''
 
-import ast
-import os
-import pathlib
-import sys
-from py5_tools import imported
-from thonny import get_version
-from thonny.common import InlineCommand, InlineResponse
-try:  # thonny 4 package layout
-    from thonny import jedi_utils
-    from thonny.plugins.cpython_backend import (
-      get_backend,
-      MainCPythonBackend
-    )
-    # add plug-in packages to packages path
-    # https://groups.google.com/g/thonny/c/dhMOGXZHTDU
-    from thonny import get_sys_path_directory_containg_plugins
-    sys.path.append(get_sys_path_directory_containg_plugins())
-except ImportError:  # thonny 3 package layout
-    from thonny.plugins.cpython.cpython_backend import (
-      get_backend,
-      MainCPythonBackend
-    )
+from os import environ as env
+from sys import path
 
+from typing import TypeAlias
+
+from thonny.common import CompletionInfo
+from thonny.plugins.cpython_backend import MainCPythonBackend
+from thonny import jedi_utils, get_sys_path_directory_containg_plugins
+
+path.append( get_sys_path_directory_containg_plugins() )
+
+AutoComplete: TypeAlias = dict[str, list[CompletionInfo] | str | None]
+
+def patched_editor_autocomplete(self: MainCPythonBackend, cmd) -> AutoComplete:
+    '''Add py5 to autocompletion'''
 
-def patched_editor_autocomplete(
-      self: MainCPythonBackend, cmd: InlineCommand) -> InlineResponse:
-    '''add py5 to autocompletion'''
     prefix = 'from py5 import *\n'
-    cmd['source'] = prefix + cmd['source']
-    cmd['row'] += 1
 
-    if int(get_version()[0]) >= 4:  # thonny 4 package layout
-        result = dict(
-          source=cmd.source,
-          row=cmd.row,
-          column=cmd.column,
-          filename=cmd.filename,
-        )
-        result['completions'] = jedi_utils.get_script_completions(
-          **result, sys_path=[get_sys_path_directory_containg_plugins()]
-        )
-    else:
-        result = get_backend()._original_editor_autocomplete(cmd)
+    cmd.source = prefix + cmd.source
+    cmd.row += 1
 
-    result['row'] -= 1
-    result['source'] = result['source'][len(prefix):]
-    return result
+    completions = jedi_utils.get_script_completions(
+        cmd.source,
+        cmd.row,
+        cmd.column,
+        cmd.filename,
+        sys_path=[ get_sys_path_directory_containg_plugins() ])
+
+    cmd.row -= 1
+    cmd.source = cmd.source[len(prefix):]
+
+    return {
+        'source': cmd.source,
+        'row': cmd.row,
+        'column': cmd.column,
+        'filename': cmd.filename,
+        'completions': completions }
 
 
 def load_plugin() -> None:
-    '''every thonny plug-in uses this function to load'''
-    if os.environ.get('PY5_IMPORTED_MODE', 'False').lower() == 'false':
-        return
+    '''Every Thonny plug-in uses this function to load'''
+    if env.get('PY5_IMPORTED_MODE', 'False').lower() == 'false': return
+
+    # Note that _cmd_editor_autocomplete() is not a public API
+    # May need to treat different Thonny versions differently:
+    # https://groups.Google.com/g/thonny/c/wWCeXWpKy8c
 
-    # note that _cmd_editor_autocomplete is not a public api
-    # may need to treat different thonny versions differently
-    # https://groups.google.com/g/thonny/c/wWCeXWpKy8c
     c_e_a = MainCPythonBackend._cmd_editor_autocomplete
-    MainCPythonBackend._original_editor_autocomplete = c_e_a
+    setattr(MainCPythonBackend, '_original_editor_autocomplete', c_e_a)
     MainCPythonBackend._cmd_editor_autocomplete = patched_editor_autocomplete