Merge pull request 'develop' (#3) from develop into master

Reviewed-on: #3

plugins/code/commands/file_history/plugin.py

@@ -25,7 +25,7 @@ class Plugin(PluginCode):
             if len(history) == history_size:
                 history.pop(0)
 
-            history.append(event.file.fpath)
+            history.append(event.file)
 
     def load(self):
         self._manage_signals("register_command")
@@ -60,6 +60,6 @@ class Handler:
 
         view._on_uri_data_received(
             [
-                f"file://{history.pop()}"
+                history.pop().replace("file://", "")
             ]
         )

plugins/code/commands/nanoesq_temp_buffer/plugin.py

@@ -23,7 +23,7 @@ class Plugin(PluginCode):
     def load(self):
         self._manage_signals("register_command")
 
-    def unload(self):
+    def load(self):
         self._manage_signals("unregister_command")
 
     def _manage_signals(self, action: str):

plugins/code/commands/split_pane_manager/__init__.py

@@ -1,3 +0,0 @@
-"""
-    Pligin Module
-"""

plugins/code/commands/split_pane_manager/__main__.py

@@ -1,3 +0,0 @@
-"""
-    Pligin Package
-"""

plugins/code/commands/split_pane_manager/close_split_view.py

@@ -1,64 +0,0 @@
-# Python imports
-
-# Lib imports
-import gi
-
-gi.require_version('Gtk', '3.0')
-gi.require_version('GtkSource', '4')
-
-from gi.repository import Gtk
-from gi.repository import GtkSource
-
-# Application imports
-from libs.event_factory import Event_Factory, Code_Event_Types
-
-
-
-emit_to: callable = None
-
-def execute(
-    source_view,
-    char_str,
-    modkeys_states
-):
-    logger.debug("Command: Close Split Pane")
-
-    scrolled_win = source_view.get_parent()
-    pane         = scrolled_win.get_parent()
-
-    if not isinstance(pane, Gtk.Paned): return
-
-    container    = pane.get_parent()
-    source_view1 = pane.get_child1()
-    source_view2 = pane.get_child2()
-
-    if scrolled_win == source_view1:
-        remaining    = source_view2
-        closing_view = source_view
-    else:
-        remaining    = source_view1
-        closing_view = source_view
-
-    remaining_view = remaining.get_child()
-    left           = closing_view.sibling_left
-    right          = closing_view.sibling_right
-
-    if left:
-        left.sibling_right = right
-
-    if right:
-        right.sibling_left = left
-
-    pane.remove(source_view1)
-    pane.remove(source_view2)
-
-    container.remove(pane)
-    container.add(remaining)
-
-    event = Event_Factory.create_event(
-        "remove_source_view",
-        view = closing_view
-    )
-    emit_to("source_views", event)
-
-    remaining_view.grab_focus()

plugins/code/commands/split_pane_manager/create_split_view.py

@@ -1,66 +0,0 @@
-# Python imports
-
-# Lib imports
-import gi
-
-gi.require_version("Gtk", "3.0")
-
-from gi.repository import Gtk
-
-# Application imports
-from libs.event_factory import Event_Factory, Code_Event_Types
-from libs.dto.states import SourceViewStates
-
-
-
-emit_to: callable = None
-
-def execute(
-    source_view1,
-    char_str,
-    modkeys_states
-):
-    logger.debug("Command: Split Pane")
-
-    scrolled_win1  = source_view1.get_parent()
-    container      = scrolled_win1.get_parent()
-    pane           = Gtk.Paned()
-    event          = Event_Factory.create_event(
-        "create_source_view",
-        state = SourceViewStates.INSERT
-    )
-    emit_to("source_views", event)
-
-    scrolled_win2,    \
-    source_view2      = event.response
-    old_sibling_right = None
-
-    if source_view1.sibling_right:
-        old_sibling_right = source_view1.sibling_right
-
-    source_view1.sibling_right = source_view2
-    if old_sibling_right:
-        old_sibling_right.sibling_left = source_view2
-        source_view2.sibling_right     = old_sibling_right
-
-    source_view2.sibling_left  = source_view1
-
-    pane.set_hexpand(True)
-    pane.set_vexpand(True)
-    pane.set_wide_handle(True)
-
-    container.remove(scrolled_win1)
-    pane.pack1( scrolled_win1, True, True )
-    pane.pack2( scrolled_win2, True, True )
-    container.add(pane)
-
-    pane.show_all()
-
-    is_control, is_shift, is_alt = modkeys_states
-    if is_control and is_shift:
-        pane.set_orientation(Gtk.Orientation.VERTICAL)
-    elif is_control:
-        pane.set_orientation(Gtk.Orientation.HORIZONTAL)
-
-    source_view2.grab_focus()
-    source_view2.command.exec("new_file")

plugins/code/commands/split_pane_manager/plugin.py

@@ -1,100 +0,0 @@
-# Python imports
-
-# Lib imports
-import gi
-
-gi.require_version("Gtk", "3.0")
-
-from gi.repository import Gtk
-
-# Application imports
-from plugins.plugin_types import PluginCode
-
-from libs.event_factory import Event_Factory, Code_Event_Types
-
-from . import create_split_view,    \
-              close_split_view,     \
-              focus_left_sibling,   \
-              focus_right_sibling,  \
-              move_to_left_sibling, \
-              move_to_right_sibling
-
-
-
-class Plugin(PluginCode):
-    def __init__(self):
-        super(Plugin, self).__init__()
-
-
-    def _controller_message(self, event: Code_Event_Types.CodeEvent):
-        ...
-
-    def load(self):
-        gemit_to = self.emit_to
-        self._manage_signals("register_command")
-
-    def unload(self):
-        self._manage_signals("unregister_command")
-
-    def _manage_signals(self, action: str):
-        _create_split_view         = create_split_view
-        _close_split_view          = close_split_view
-        _create_split_view.emit_to = self.emit_to
-        _close_split_view.emit_to  = self.emit_to
-
-        event = Event_Factory.create_event(action,
-            command_name = "create_split_view",
-            command      = _create_split_view,
-            binding_mode = "released",
-            binding      = ["<Control>\\", "<Shift><Control>|"]
-        )
-
-        self.emit_to("source_views", event)
-
-        event = Event_Factory.create_event(action,
-            command_name = "close_split_view",
-            command      = _close_split_view,
-            binding_mode = "released",
-            binding      = "<Shift><Control>w"
-        )
-
-        self.emit_to("source_views", event)
-
-        event = Event_Factory.create_event(action,
-            command_name = "focus_left_sibling",
-            command      = focus_left_sibling,
-            binding_mode = "released",
-            binding      = "<Control>Page_Up"
-        )
-
-        self.emit_to("source_views", event)
-
-        event = Event_Factory.create_event(action,
-            command_name = "focus_right_sibling",
-            command      = focus_right_sibling,
-            binding_mode = "released",
-            binding      = "<Control>Page_Down"
-        )
-
-        self.emit_to("source_views", event)
-
-        event = Event_Factory.create_event(action,
-            command_name = "move_to_left_sibling",
-            command      = move_to_left_sibling,
-            binding_mode = "released",
-            binding      = "<Control><Shift>Up"
-        )
-
-        self.emit_to("source_views", event)
-
-        event = Event_Factory.create_event(action,
-            command_name = "move_to_right_sibling",
-            command      = move_to_right_sibling,
-            binding_mode = "released",
-            binding      = "<Control><Shift>Down"
-        )
-
-        self.emit_to("source_views", event)
-
-    def run(self):
-        ...

plugins/code/commands/toggle_source_view/__init__.py

@@ -0,0 +1,3 @@
+"""
+    Plugin Module
+"""

plugins/code/commands/toggle_source_view/__main__.py

@@ -0,0 +1,3 @@
+"""
+    Plugin Package
+"""

plugins/code/commands/toggle_source_view/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name": "Split Pane Manager",
+    "name": "Toggle Source View",
     "author": "ITDominator",
     "version": "0.0.1",
     "support": "",

plugins/code/commands/toggle_source_view/plugin.py

@@ -0,0 +1,64 @@
+# Python imports
+
+# Lib imports
+
+# Application imports
+from libs.event_factory import Event_Factory, Code_Event_Types
+
+from plugins.plugin_types import PluginCode
+
+
+
+class Plugin(PluginCode):
+    def __init__(self):
+        super(Plugin, self).__init__()
+
+    def _controller_message(self, event: Code_Event_Types.CodeEvent):
+        ...
+
+    def load(self):
+        event = Event_Factory.create_event("register_command",
+            command_name = "toggle_source_view",
+            command      = Handler,
+            binding_mode = "released",
+            binding      = "<Shift><Control>h"
+        )
+
+        self.emit_to("source_views", event)
+
+    def unload(self):
+        event = Event_Factory.create_event("unregister_command",
+            command_name = "toggle_source_view",
+            command      = Handler,
+            binding_mode = "released",
+            binding      = "<Shift><Control>h"
+        )
+
+        self.emit_to("source_views", event)
+
+    def run(self):
+        ...
+
+
+class Handler:
+    @staticmethod
+    def execute(
+        view: any,
+        char_str: str,
+        *args,
+        **kwargs
+    ):
+        logger.debug("Command: Toggle Source View")
+        target = view.get_parent()
+        target.hide() if target.is_visible() else target.show()
+
+        if view.sibling_left:
+            target = view.sibling_left.get_parent()
+            target.show()
+            view.sibling_left.grab_focus()
+
+        if view.sibling_right:
+            target = view.sibling_right.get_parent()
+            target.show()
+            view.sibling_right.grab_focus()
+

plugins/code/event-watchers/file_state_watcher/plugin.py

@@ -24,7 +24,6 @@ class Plugin(PluginCode):
         self.emit_to("files", event)
 
         file = event.response
-        if not file: return
         if file.ftype == "buffer": return
 
         file.check_file_on_disk()

plugins/code/language_server_clients/lsp_manager/client/lsp_client.py

@@ -19,10 +19,13 @@ class LSPClient(LSPClientWebsocket):
     def __init__(self):
         super(LSPClient, self).__init__()
 
+        # https://github.com/microsoft/multilspy/tree/main/src/multilspy/language_servers
+        # initialize-params-slim.json was created off of jedi_language_server one
+        # self._init_params   = settings_manager.get_lsp_init_data()
+
         self._language: str                 = ""
-        self._workspace_path: str           = ""
         self._init_params: dict             = {}
-        self._init_opts: dict               = {}
+        self._event_history: dict[int, str] = {}
 
         try:
             _USER_HOME  = path.expanduser('~')
@@ -30,29 +33,19 @@ class LSPClient(LSPClientWebsocket):
             _LSP_INIT_CONFIG = f"{_SCRIPT_PTH}/../configs/initialize-params-slim.json"
 
             with open(_LSP_INIT_CONFIG) as file:
-                data = file.read()
+                data = file.read().replace("{user.home}", _USER_HOME)
                 self._init_params = json.loads(data)
         except Exception as e:
             logger.error( f"LSP Controller: {_LSP_INIT_CONFIG}\n\t\t{repr(e)}" )
 
-
-        self._socket                        = None
         self._message_id: int = -1
-        self._event_history: dict[int, str] = {}
+        self._socket          = None
-
         self.read_lock        = threading.Lock()
         self.write_lock       = threading.Lock()
 
-
     def set_language(self, language: str):
         self._language = language
 
-    def set_workspace_path(self, workspace_path: str):
-        self._workspace_path = workspace_path
-
-    def set_init_opts(self, init_opts: dict[str, str]):
-        self._init_opts = init_opts
-
     def set_socket(self, socket: str):
         self._socket = socket
 

plugins/code/language_server_clients/lsp_manager/client/lsp_client_events.py

@@ -17,12 +17,11 @@ from ..dto.code.lsp.lsp_messages import symbols_request
 
 
 class LSPClientEvents:
-    def send_initialize_message(self):
+    def send_initialize_message(self, init_ops: dict, workspace_file: str, workspace_uri: str):
-        folder_name   = os.path.basename(self._workspace_path)
+        folder_name = os.path.basename(workspace_file)
-        workspace_uri = f"file://{self._workspace_path}"
 
         self._init_params["processId"]        = None
-        self._init_params["rootPath"]         = self._workspace_path
+        self._init_params["rootPath"]         = workspace_file
         self._init_params["rootUri"]          = workspace_uri
         self._init_params["workspaceFolders"] = [
             {
@@ -31,7 +30,7 @@ class LSPClientEvents:
             }
         ]
 
-        self._init_params["initializationOptions"] = self._init_opts
+        self._init_params["initializationOptions"] = init_ops
         self.send_request("initialize", self._init_params)
 
     def send_initialized_message(self):

plugins/code/language_server_clients/lsp_manager/lsp_manager.py

@@ -54,21 +54,17 @@ class LSPManager(ControllerBase):
             self.response_registry.unregister_handler(event.lang_id)
             self.lsp_manager_ui.remove_client_listing(event.lang_id)
 
-    def _on_create_client(self, ui, lang_id: str, workspace_path: str) -> bool:
+    def _on_create_client(self, ui, lang_id: str, workspace_uri: str) -> bool:
         init_opts = ui.get_init_opts(lang_id)
-        result    = self.create_client(lang_id, workspace_path, init_opts)
+        result = self.create_client(lang_id, workspace_uri, init_opts)
-
         if result:
             ui.toggle_client_buttons(show_close=True)
-
         return result
 
     def _on_close_client(self, ui, lang_id: str) -> bool:
         result = self.close_client(lang_id)
-
         if result:
             ui.toggle_client_buttons(show_close=False)
-
         return result
 
     def handle_destroy(self):
@@ -77,12 +73,12 @@ class LSPManager(ControllerBase):
 
     def create_client(
         self,
-        lang_id: str,
+        lang_id: str = "python",
-        workspace_path: str,
+        workspace_uri: str = "",
-        init_opts: dict[str, str]
+        init_opts: dict = {}
     ) -> bool:
         client  = self.lsp_manager_client.create_client(
-            lang_id, workspace_path, init_opts
+            lang_id, workspace_uri, init_opts
         )
         handler = self.response_registry.get_handler(lang_id)
         self.lsp_manager_client.active_language_id = lang_id
@@ -96,7 +92,7 @@ class LSPManager(ControllerBase):
         handler.set_response_cache(self.response_cache)
 
         client.handle_lsp_response = self.server_response
-        client.send_initialize_message()
+        client.send_initialize_message(init_opts, "", f"file://{workspace_uri}")
 
         return True
 

plugins/code/language_server_clients/lsp_manager/lsp_manager_client.py

@@ -22,9 +22,9 @@ class LSPManagerClient(LSPClientEventsMixin):
 
     def create_client(
         self,
-        lang_id: str,
+        lang_id: str = "python",
-        workspace_path: str,
+        workspace_uri: str = "",
-        init_opts: dict[str, str]
+        init_opts: dict = {}
     ) -> LSPClient:
         if lang_id in self.clients: return None
 
@@ -33,10 +33,8 @@ class LSPManagerClient(LSPClientEventsMixin):
         uri     = f"ws://{address}:{port}/{lang_id}"
         client  = LSPClient()
 
-        client.set_socket(uri)
         client.set_language(lang_id)
-        client.set_workspace_path(workspace_path)
+        client.set_socket(uri)
-        client.set_init_opts(init_opts)
         client.start_client()
 
         if not client.ws_client.wait_for_connection(timeout = 5.0):

plugins/code/language_server_clients/lsp_manager/lsp_manager_ui.py

@@ -1,5 +1,4 @@
 # Python imports
-from os import path
 import json
 
 # Lib imports
@@ -25,8 +24,6 @@ class LSPManagerUI(Gtk.Dialog):
     def __init__(self):
         super(LSPManagerUI, self).__init__()
 
-        self._USER_HOME = path.expanduser('~')
-
         self.client_configs: dict[str, str] = {}
 
         self.source_view               = None
@@ -170,11 +167,9 @@ class LSPManagerUI(Gtk.Dialog):
         lang_id  = self.combo_box.get_active_text()
         if not lang_id: return
 
-        json_str = self.client_configs[lang_id]                       \
+        json_str = self.client_configs[lang_id].replace("{workspace.folder}", workspace_dir)
-                        .replace("{workspace.folder}", workspace_dir) \
-                        .replace("{user.home}", self._USER_HOME)
-
         buffer   = self.source_view.get_buffer()
+
         buffer.set_text(json_str, -1)
 
     def map_parent_resize_event(self, parent):
@@ -209,7 +204,7 @@ class LSPManagerUI(Gtk.Dialog):
         model = self.combo_box.get_model()
 
         for i, row in enumerate(model):
-            if row[0] == lang_id:
+            if row[0] == lang_id:  # assuming text is in column 0
                 self.combo_box.remove(i)
                 break
 
@@ -220,9 +215,7 @@ class LSPManagerUI(Gtk.Dialog):
         if not lang_id or lang_id not in self.client_configs: return {}
 
         try:
-            buffer      = self.source_view.get_buffer()
+            lang_config = json.loads(self.client_configs[lang_id])
-            json_str    = buffer.get_text(*buffer.get_bounds(), -1)
-            lang_config = json.loads(json_str)
         except json.JSONDecodeError as e:
             logger.error(f"Invalid JSON for {lang_id}: {e}")
             return {}

plugins/code/language_server_clients/python_lsp_client/config/jedi-lsp-server-config.json

@@ -1,100 +0,0 @@
-{
-    "info": "https://github.com/python-lsp/python-lsp-server",
-    "command": "lsp-ws-proxy -- pylsp",
-    "alt-command": "pylsp",
-    "alt-command2": "lsp-ws-proxy --listen 4114 -- pylsp",
-    "alt-command3": "pylsp --ws --port 4114",
-    "socket": "ws://127.0.0.1:9999/python",
-    "socket-two": "ws://127.0.0.1:9999/?name=pylsp",
-    "initialization-options": {
-        "pylsp": {
-            "rope": {
-                "ropeFolder": "{user.home}/.config/newton/lsps/ropeproject"
-            },
-            "plugins": {
-                "ruff": {
-                    "enabled": true,
-                    "extendSelect": ["I"],
-                    "lineLength": 80
-                },
-                "pycodestyle": {
-                    "enabled": false
-                },
-                "pyflakes": {
-                    "enabled": false
-                },
-                "pylint": {
-                    "enabled": true
-                },
-                "mccabe": {
-                    "enabled": false
-                },
-                "pylsp_rope": {
-                    "rename": false
-                },
-                "rope_rename": {
-                    "enabled": false
-                },
-                "rope_autoimport": {
-                    "enabled": true
-                },
-                "rope_completion": {
-                    "enabled": false,
-                    "eager": false
-                },
-                "jedi_rename": {
-                    "enabled": true
-                },
-                "jedi_completion": {
-                    "enabled": true,
-                    "include_class_objects": true,
-                    "include_function_objects": true,
-                    "fuzzy": false
-                },
-                "jedi": {
-                    "root_dir": "file://{workspace.folder}",
-                    "extra_paths": [
-                        "{user.home}/Portable_Apps/py-venvs/pylsp-venv/venv/lib/python3.10/site-packages"
-                    ]
-                }
-            }
-        }
-    }
-},
-"python - jedi-language-server": {
-    "hidden": true,
-    "info": "https://pypi.org/project/jedi-language-server/",
-    "command": "jedi-language-server",
-    "alt-command": "lsp-ws-proxy --listen 3030 -- jedi-language-server",
-    "socket": "ws://127.0.0.1:9999/python",
-    "socket-two": "ws://127.0.0.1:9999/?name=jedi-language-server",
-    "initialization-options": {
-        "jediSettings": {
-            "autoImportModules": [],
-            "caseInsensitiveCompletion": true,
-            "debug": false
-        },
-        "completion": {
-            "disableSnippets": false,
-            "resolveEagerly": false,
-            "ignorePatterns": []
-        },
-        "markupKindPreferred": "markdown",
-        "workspace": {
-            "extraPaths": [
-                "{user.home}/Portable_Apps/py-venvs/pylsp-venv/venv/lib/python3.10/site-packages"
-            ],
-            "environmentPath": "{user.home}/Portable_Apps/py-venvs/gtk-apps-venv/venv/bin/python",
-            "symbols": {
-                "ignoreFolders": [
-                    ".nox",
-                    ".tox",
-                    ".venv",
-                    "__pycache__",
-                    "venv"
-                ],
-                "maxSymbols": 20
-            }
-        }
-    }
-}

plugins/code/language_server_clients/python_lsp_client/config/lsp-server-config.json

@@ -60,4 +60,41 @@
             }
         }
     }
+},
+"python - jedi-language-server": {
+    "hidden": true,
+    "info": "https://pypi.org/project/jedi-language-server/",
+    "command": "jedi-language-server",
+    "alt-command": "lsp-ws-proxy --listen 3030 -- jedi-language-server",
+    "socket": "ws://127.0.0.1:9999/python",
+    "socket-two": "ws://127.0.0.1:9999/?name=jedi-language-server",
+    "initialization-options": {
+        "jediSettings": {
+            "autoImportModules": [],
+            "caseInsensitiveCompletion": true,
+            "debug": false
+        },
+        "completion": {
+            "disableSnippets": false,
+            "resolveEagerly": false,
+            "ignorePatterns": []
+        },
+        "markupKindPreferred": "markdown",
+        "workspace": {
+            "extraPaths": [
+                "{user.home}/Portable_Apps/py-venvs/pylsp-venv/venv/lib/python3.10/site-packages"
+            ],
+            "environmentPath": "{user.home}/Portable_Apps/py-venvs/gtk-apps-venv/venv/bin/python",
+            "symbols": {
+                "ignoreFolders": [
+                    ".nox",
+                    ".tox",
+                    ".venv",
+                    "__pycache__",
+                    "venv"
+                ],
+                "maxSymbols": 20
+            }
+        }
+    }
 }

plugins/code/ui/tabs_bar/plugin.py

@@ -1,9 +1,6 @@
 # Python imports
 
 # Lib imports
-import gi
-
-from gi.repository import Gtk
 
 # Application imports
 from libs.event_factory import Event_Factory, Code_Event_Types
@@ -28,19 +25,8 @@ class Plugin(PluginCode):
 
         self.register_controller("tabs", self.tabs_controller)
 
-        scrolled_win = Gtk.ScrolledWindow()
+        code_container.add( self.tabs_controller.tabs_widget )
-        viewport     = Gtk.Viewport()
+        code_container.reorder_child(self.tabs_controller.tabs_widget, 0)
-
-        scrolled_win.set_overlay_scrolling(False)
-        scrolled_win.set_size_request(-1, 50)
-
-        viewport.add( self.tabs_controller.tabs_widget )
-        scrolled_win.add( viewport )
-        code_container.add( scrolled_win )
-        code_container.reorder_child(scrolled_win, 0)
-
-        viewport.show()
-        scrolled_win.show()
 
         event = Event_Factory.create_event("get_files")
         self.emit_to("files", event)
@@ -50,14 +36,7 @@ class Plugin(PluginCode):
     def unload(self):
         self.unregister_controller("tabs")
         self.tabs_controller.unload_tabs()
-
+        self.tabs_controller.tabs_widget.destroy()
-        tabs_widget  = self.tabs_controller.tabs_widget
-        viewport     = tabs_widget.get_parent()
-        scrolled_win = viewport.get_parent()
-
-        tabs_widget.destroy()
-        viewport.destroy()
-        scrolled_win.destroy()
 
         self.tabs_controller.tabs_widget = None
         self.tabs_controller             = None

plugins/code/ui/tabs_bar/tabs_widget.py

@@ -27,7 +27,7 @@ class TabsWidget(Gtk.Notebook):
 
 
     def _setup_styling(self):
-        ...
+        self.set_scrollable(True)
 
     def _setup_signals(self):
         self.connect("page-added", self._page_added)
@@ -67,7 +67,6 @@ class TabsWidget(Gtk.Notebook):
         )
 
         self.emit(event)
-        self._scroll_to_center(tab)
 
     def _bind_tab_menu(self, tab, page_widget):
         def do_context_menu(tab, eve, page_widget):
@@ -82,21 +81,6 @@ class TabsWidget(Gtk.Notebook):
                 page_widget
             )
 
-    def _scroll_to_center(self, tab):
-        scrolled_win = self.get_parent().get_parent()
-        alloc        = tab.get_allocation()
-        tab_x        = alloc.x
-        tab_width    = alloc.width
-        view_width   = scrolled_win.get_allocated_width()
-        target       = tab_x + tab_width / 2 - view_width / 2
-        adj          = scrolled_win.get_hadjustment()
-        lower        = adj.get_lower()
-        upper        = adj.get_upper()
-        page_size    = adj.get_page_size()
-        target       = max(lower, min(target, upper - page_size))
-
-        adj.set_value(target)
-
     def create_menu(self, page_widget) -> Gtk.Menu:
         context_menu  = Gtk.Menu()
         close_submenu = Gtk.Menu()
@@ -146,7 +130,6 @@ class TabsWidget(Gtk.Notebook):
                 self.page_num(page_widget)
             )
             self.handler_unblock(self.switch_page_id)
-            self._scroll_to_center(tab)
 
             break
 

src/core/containers/center_container.py

@@ -6,7 +6,7 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
-from core.widgets.webkit.webkit_ui import WebkitUI
+from ..widgets.webkit.webkit_ui import WebkitUI
 
 
 
@@ -28,7 +28,6 @@ class CenterContainer(Gtk.Box):
         self.set_orientation(Gtk.Orientation.VERTICAL)
         self.set_hexpand(True)
         self.set_vexpand(True)
-        self.set_size_request(320, -1)
 
     def _setup_signals(self):
         self.connect("show", self._handle_show)

src/core/containers/code/code_container.py

@@ -6,6 +6,10 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
+from ...widgets.code.code_base import CodeBase
+
+from ...widgets.separator_widget import Separator
+
 from .editors_container import EditorsContainer
 
 
@@ -23,9 +27,6 @@ class CodeContainer(Gtk.Box):
 
 
     def _setup_styling(self):
-        self.ctx = self.get_style_context()
-        self.ctx.add_class("code-container")
-
         self.set_orientation(Gtk.Orientation.VERTICAL)
 
     def _setup_signals(self):
@@ -36,4 +37,18 @@ class CodeContainer(Gtk.Box):
 
     def _load_widgets(self):
         widget_registery.expose_object("code-container", self)
-        self.add( EditorsContainer() )
+
+        code_base = CodeBase()
+
+        self.add( self._create_editor_widget(code_base) )
+
+    def _create_editor_widget(self, code_base: CodeBase):
+        editors_container = Gtk.Box()
+
+        widget_registery.expose_object("editors-container", editors_container)
+
+        editors_container.add( Separator("separator_left") )
+        editors_container.add( EditorsContainer(code_base) )
+        editors_container.add( Separator("separator_right") )
+
+        return editors_container

src/core/containers/code/editors_container.py

@@ -4,17 +4,18 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
+#from gi.repository import GLib
 
 # Application imports
-from core.widgets.code.code_base import CodeBase
-from core.widgets.separator_widget import Separator
 
 
 
-class EditorsContainer(Gtk.Box):
+class EditorsContainer(Gtk.Paned):
-    def __init__(self):
+    def __init__(self, code_base: any):
         super(EditorsContainer, self).__init__()
 
+        self.code_base = code_base
+
         self._setup_styling()
         self._setup_signals()
         self._subscribe_to_events()
@@ -23,11 +24,11 @@ class EditorsContainer(Gtk.Box):
 
     def _setup_styling(self):
         self.ctx = self.get_style_context()
-        self.ctx.add_class("editors-container")
+        self.ctx.add_class("paned-editors-container")
 
         self.set_hexpand(True)
         self.set_vexpand(True)
-        self.set_size_request(320, -1)
+        self.set_wide_handle(True)
 
     def _setup_signals(self):
         self.connect("map", self._init_map)
@@ -36,16 +37,26 @@ class EditorsContainer(Gtk.Box):
         ...
 
     def _load_widgets(self):
-        box            = Gtk.Box()
+        self.scrolled_win1, \
-        widget_registery.expose_object("editors-container", self)
+        self.scrolled_win2 = self._create_views()
-        self.code_base = CodeBase()
-        scrolled_win,  \
-        source_view    = self.code_base.create_source_view()
 
-        box.add( scrolled_win )
+        self.pack1( self.scrolled_win1, True, True )
-        self.add( Separator("separator_left") )
+        self.pack2( self.scrolled_win2, True, True )
-        self.add( box )
+
-        self.add( Separator("separator_right") )
+    def _create_views(self):
+        scrolled_win1 = Gtk.ScrolledWindow()
+        scrolled_win2 = Gtk.ScrolledWindow()
+
+        source_view1  = self.code_base.create_source_view()
+        source_view2  = self.code_base.create_source_view()
+
+        source_view1.sibling_right = source_view2
+        source_view2.sibling_left  = source_view1
+
+        scrolled_win1.add( source_view1 )
+        scrolled_win2.add( source_view2 )
+
+        return scrolled_win1, scrolled_win2
 
     def _init_map(self, view):
         self.disconnect_by_func( self._init_map )

src/core/containers/footer_container.py

@@ -6,7 +6,7 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
-from core.widgets.separator_widget import Separator
+from ..widgets.separator_widget import Separator
 
 
 

src/core/containers/header_container.py

@@ -6,9 +6,9 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
-from core.widgets.separator_widget import Separator
+from ..widgets.separator_widget import Separator
-from core.widgets.controls.open_files_button import OpenFilesButton
+from ..widgets.controls.open_files_button import OpenFilesButton
-from core.widgets.controls.transparency_scale import TransparencyScale
+from ..widgets.controls.transparency_scale import TransparencyScale
 
 
 

src/core/containers/left_container.py

@@ -6,8 +6,7 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
-from core.widgets.separator_widget import Separator
+from ..widgets.separator_widget import Separator
-
 from .code.code_container import CodeContainer
 
 

src/core/containers/right_container.py

@@ -6,8 +6,8 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
-from core.widgets.separator_widget import Separator
+from ..widgets.separator_widget import Separator
-from core.widgets.vte_widget import VteWidget
+from ..widgets.vte_widget import VteWidget
 
 
 

src/core/controllers/base_controller_mixin.py

@@ -18,12 +18,16 @@ class BaseControllerMixin:
         files       = []
 
         for arg in unknownargs + [args.new_tab,]:
-            if os.path.isfile(arg):
+            if os.path.isdir( arg.replace("file://", "") ):
-                files.append(f"{arg}")
+                files.append( f"DIR|{arg.replace('file://', '')}" )
+                continue
 
-            if os.path.isdir(arg):
+            # NOTE: If passing line number with file split against :
-                message = f"DIR|{arg}"
+            if os.path.isfile( arg.replace("file://", "").split(":")[0] ):
-                ipc_server.send_ipc_message(message)
+                files.append( f"FILE|{arg.replace('file://', '')}" )
+                continue
+
+            logger.info(f"Not a File: {arg}")
 
         if not files: return
 

src/core/widgets/code/code_base.py

@@ -34,6 +34,7 @@ class CodeBase:
         completion_controller   = CompletionController()
         source_views_controller = SourceViewsController()
 
+        # self.controller_manager.register_controller("base", self)
         self.controller_manager.register_controller("files", files_controller)
         self.controller_manager.register_controller("commands", commands_controller)
         self.controller_manager.register_controller("completion", completion_controller)
@@ -42,13 +43,12 @@ class CodeBase:
         self.controller_manager.register_controller("widgets", widget_registery)
 
     def create_source_view(self):
-        scrolled_win, \
         source_view = self.controller_manager["source_views"].create_source_view()
         self.controller_manager["completion"].register_completer(
             source_view.get_completion()
         )
 
-        return scrolled_win, source_view
+        return source_view
 
     def first_map_load(self):
         self.controller_manager["source_views"].first_map_load()

src/core/widgets/code/command_system/__init__.py

@@ -2,4 +2,4 @@
     Code Command System Package
 """
 
-from .source_view_command_system import SourceViewCommandSystem
+from .command_system import CommandSystem

src/core/widgets/code/command_system/command_system.py

@@ -0,0 +1,120 @@
+# Python imports
+
+# Lib imports
+
+# Application imports
+from libs.event_factory import Event_Factory, Code_Event_Types
+
+from ..mixins.command_system_mixin import CommandSystemMixin
+from ..source_view import SourceView
+
+from . import commands
+
+
+
+class CommandSystem(CommandSystemMixin):
+    def __init__(self):
+        super(CommandSystem, self).__init__()
+
+        self.data: list = ()
+
+
+    def set_data(self, *args, **kwargs):
+        self.data = (args, kwargs)
+
+    def exec(self, command: str) -> any:
+        if not hasattr(commands, command): return
+        method = getattr(commands, command)
+
+        args, kwargs = self.data
+        return method.execute(*args, **kwargs)
+
+    def exec_with_args(self, command: str, *args, **kwargs) -> any:
+        if not hasattr(commands, command): return
+
+        method = getattr(commands, command)
+        return method.execute(*args, **kwargs)
+
+    def add_command(self, command_name: str, command: callable):
+        setattr(commands, command_name, command)
+
+    def remove_command(self, command_name: str, command: callable):
+        if hasattr(commands, command_name):
+            delattr(commands, command_name)
+
+
+    def emit(self, event: Code_Event_Types.CodeEvent):
+        """ Monkey patch 'emit' from command controller... """
+        ...
+
+    def emit_to(self, controller: str, event: Code_Event_Types.CodeEvent):
+        """ Monkey patch 'emit_to' from command controller... """
+        ...
+
+
+#    def filter_out_loaded_files(self, uris: list[str]):
+#        event = Event_Factory.create_event(
+#            "filter_out_loaded_files",
+#            uris = uris
+#        )
+#
+#        self.emit_to("files", event)
+#
+#        return event.response
+#
+#    def set_info_labels(self, data: tuple[str]):
+#        event = Event_Factory.create_event(
+#            "set_info_labels",
+#            info = data
+#        )
+#
+#        self.emit_to("plugins", event)
+#
+#    def get_file(self, view: SourceView):
+#        event = Event_Factory.create_event(
+#            "get_file",
+#            view   = view,
+#            buffer = view.get_buffer()
+#        )
+#
+#        self.emit_to("files", event)
+#
+#        return event.response
+#
+#    def get_swap_file(self, view: SourceView):
+#        event = Event_Factory.create_event(
+#            "get_swap_file",
+#            view   = view,
+#            buffer = view.get_buffer()
+#        )
+#
+#        self.emit_to("files", event)
+#
+#        return event.response
+#
+#    def new_file(self, view: SourceView):
+#        event = Event_Factory.create_event("add_new_file", view = view)
+#
+#        self.emit_to("files", event)
+#
+#        return event.response
+#
+#    def remove_file(self, view: SourceView):
+#        event = Event_Factory.create_event(
+#            "remove_file",
+#            view   = view,
+#            buffer = view.get_buffer()
+#        )
+#
+#        self.emit_to("files", event)
+#
+#        return event.response
+#
+#    def request_completion(self, view: SourceView):
+#        event = Event_Factory.create_event(
+#            "request_completion",
+#            view   = view,
+#            buffer = view.get_buffer()
+#        )
+#
+#        self.emit_to("completion", event)

src/core/widgets/code/command_system/commands/focus_left_sibling.py

@@ -7,7 +7,6 @@ gi.require_version('GtkSource', '4')
 
 from gi.repository import GtkSource
 
-
 # Application imports
 
 
@@ -19,4 +18,5 @@ def execute(
 ):
     logger.debug("Command: Focus Left Sibling")
     if not view.sibling_left: return
+    view.sibling_left.get_parent().show()
     view.sibling_left.grab_focus()

src/core/widgets/code/command_system/commands/focus_right_sibling.py

@@ -18,4 +18,5 @@ def execute(
 ):
     logger.debug("Command: Focus Right Sibling")
     if not view.sibling_right: return
+    view.sibling_right.get_parent().show()
     view.sibling_right.grab_focus()

src/core/widgets/code/command_system/commands/set_focus_border.py

@@ -20,14 +20,9 @@ def execute(
     ctx = view.get_parent().get_style_context()
     ctx.add_class("source-view-focused")
 
-    lview = view.sibling_left
+    if view.sibling_right:
-    while lview is not None:
+        ctx = view.sibling_right.get_parent().get_style_context()
-        ctx = lview.get_parent().get_style_context()
+    elif view.sibling_left:
-        ctx.remove_class("source-view-focused")
+        ctx = view.sibling_left.get_parent().get_style_context()
-        lview = lview.sibling_left
 
-    rview = view.sibling_right
-    while rview is not None:
-        ctx = rview.get_parent().get_style_context()
     ctx.remove_class("source-view-focused")
-        rview = rview.sibling_right

src/core/widgets/code/controllers/commands_controller.py

@@ -7,7 +7,7 @@ from libs.controllers.controller_base import ControllerBase
 
 from libs.event_factory import Code_Event_Types
 
-from ..command_system import SourceViewCommandSystem
+from ..command_system import CommandSystem
 
 
 
@@ -17,19 +17,14 @@ class CommandsController(ControllerBase, list):
 
 
     def _controller_message(self, event: Code_Event_Types.CodeEvent):
-        if isinstance(event, Code_Event_Types.CreateCommandSystemEvent):
+        if isinstance(event, Code_Event_Types.GetNewCommandSystemEvent):
-            event.response = self.create_command_system()
+            event.response = self.get_new_command_system()
-        elif isinstance(event, Code_Event_Types.RemovedSourceViewEvent):
-            self.remove_command_system(event)
 
-    def create_command_system(self):
+    def get_new_command_system(self):
-        command_system         = SourceViewCommandSystem()
+        command_system         = CommandSystem()
         command_system.emit    = self.emit
         command_system.emit_to = self.emit_to
 
         self.append(command_system)
 
         return command_system
-
-    def remove_command_system(self, event: Code_Event_Types.RemovedSourceViewEvent):
-        self.remove(event.view.command)

src/core/widgets/code/controllers/views/marker_manager.py

@@ -46,24 +46,14 @@ class MarkerManager(MarkSupportMixin):
             start_itr     = buffer.get_iter_at_mark(start_mark)
             end_itr       = buffer.get_iter_at_mark(end_mark)
 
-            self._proc_move(
-                buffer, is_forward, is_selection, mode, mark_hash,
-                start_mark, end_mark, has_selection, start_itr, end_itr
-            )
-
-    def _proc_move(
-        self, buffer, is_forward: bool, is_selection: bool, mode: str,
-        mark_hash, start_mark, end_mark, has_selection, start_itr, end_itr
-    ):
             if is_selection:
-            if mark_hash:
                 self.buffer_markers[mark_hash]["is_selection"] = True
 
                 self._move_iter(buffer, end_itr, mode, is_forward)
                 buffer.move_mark(end_mark, end_itr)
 
                 self._apply_selection(buffer, start_itr, end_itr)
-            return
+                continue
 
             if has_selection:
                 caret_itr     = buffer.get_iter_at_mark(end_mark)
@@ -77,14 +67,15 @@ class MarkerManager(MarkSupportMixin):
 
                 self.collapse_selection(buffer, mark_hash, start_mark, end_mark, is_forward)
                 if mode == "word":
-                if not can_move: return
+                    if not can_move: continue
 
                     itr = caret_itr
                     self._move_iter(buffer, itr, mode, is_forward)
                     buffer.move_mark(start_mark, itr)
                     buffer.move_mark(end_mark, itr)
 
-            return
+                continue
+
 
             # No selection - move both anchor and caret together
             self._move_iter(buffer, end_itr, mode, is_forward)
@@ -95,7 +86,6 @@ class MarkerManager(MarkSupportMixin):
     def collapse_selection(self,
         buffer, mark_hash, start_mark, end_mark, is_forward: bool
     ):
-        if mark_hash:
         self.buffer_markers[mark_hash]["is_selection"] = False
 
         start_itr = buffer.get_iter_at_mark(start_mark)
@@ -115,28 +105,19 @@ class MarkerManager(MarkSupportMixin):
         buffer.move_mark(start_mark, collapse_itr)
         buffer.move_mark(end_mark, collapse_itr)
 
-    def move_along_word(self, itr: Gtk.TextIter, count: int):
+    def move_word_snake_case(self, itr: Gtk.TextIter, count: int):
-        def not_is_word(ch: str):
+        def is_word(ch):
-            return not is_word(ch)
-
-        def is_word(ch: str):
             return ch and (ch.isalnum() or ch == "_")
 
-        def is_special(ch: str):
+        def step(fwd):
-            return ch in "-"
-
-        def is_punct(ch: str):
-            return ch in ".;?!"
-
-        def step(fwd: bool):
             return itr.forward_cursor_position() if fwd else itr.backward_cursor_position()
 
-        def peek(fwd: bool):
+        def peek(fwd):
             if fwd: return itr.get_char()
             tmp = itr.copy()
             return tmp.backward_cursor_position() and tmp.get_char()
 
-        def walk(fwd, cond: callable):
+        def walk(fwd, cond):
             while True:
                 ch = peek(fwd)
                 if not cond(ch): break
@@ -145,22 +126,23 @@ class MarkerManager(MarkSupportMixin):
             return True
 
         fwd = count > 0
-        for _ in range( abs(count) ):
-            ch = peek(fwd)
 
-            if is_special(ch) or is_punct(ch):
+        for _ in range(abs(count)):
-                step(fwd)
+            ch = itr.get_char() if fwd else peek(False)
-            elif is_word(ch):
+
+            if is_word(ch):
+                # inside word
                 if not walk(fwd, is_word): return
             else:
-                if not walk(fwd, not_is_word): return
+                # in separators -> skip them, then the word
+                if not walk(fwd, lambda c: not is_word(c)): return
                 if not walk(fwd, is_word): return
 
     def _move_iter(self, buffer, itr_, mode: str, is_forward: bool):
         if mode == "char":
             itr_.forward_char() if is_forward else itr_.backward_char()
         elif mode == "word":
-            self.move_along_word(itr_, 1 if is_forward else -1)
+            self.move_word_snake_case(itr_, 1 if is_forward else -1)
         elif mode == "line":
             line   = itr_.get_line()
             offset = itr_.get_line_offset()

src/core/widgets/code/controllers/views/source_views_controller.py

@@ -1,9 +1,6 @@
 # Python imports
 
 # Lib imports
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
 
 # Application imports
 from libs.controllers.controller_base import ControllerBase
@@ -32,8 +29,6 @@ class SourceViewsController(ControllerBase, list):
     def _controller_message(self, event: Code_Event_Types.CodeEvent):
         if isinstance(event, Code_Event_Types.CreateSourceViewEvent):
             event.response = self.create_source_view(event.state)
-        elif isinstance(event, Code_Event_Types.RemoveSourceViewEvent):
-            self._remove_source_view(event)
         elif isinstance(event, Code_Event_Types.RemovedFileEvent):
             self._remove_file(event)
         elif isinstance(event, Code_Event_Types.RegisterCommandEvent):
@@ -91,7 +86,7 @@ class SourceViewsController(ControllerBase, list):
             )
 
     def _get_command_system(self):
-        event   = Event_Factory.create_event("create_command_system")
+        event   = Event_Factory.create_event("get_new_command_system")
         self.message_to("commands", event)
         command = event.response
 
@@ -108,33 +103,15 @@ class SourceViewsController(ControllerBase, list):
 
             source_view.set_buffer(event.next_file.buffer)
 
-    def _remove_source_view(self, event: Code_Event_Types.RemovedFileEvent):
-        event   = Event_Factory.create_event("removed_source_view", view = event.view)
-        self.message(event)
-
-        self.remove(event.view)
-        self.signal_mapper.disconnect_signals(event.view)
-
     def create_source_view(self, state: SourceViewStates = SourceViewStates.INSERT):
-        scrolled_win: Gtk.ScrolledWindow = Gtk.ScrolledWindow()
         source_view: SourceView = SourceView(state)
         source_view.command     = self._get_command_system()
-
-        scrolled_win.set_hexpand(True)
-        scrolled_win.set_vexpand(True)
-
         source_view.command.set_data(source_view)
+
         self.signal_mapper.connect_signals(source_view)
 
         self.append(source_view)
-        scrolled_win.add(source_view)
+        return source_view
-
-        event = Event_Factory.create_event(
-            "created_source_view", view = source_view
-        )
-        self.emit(event)
-
-        return scrolled_win, source_view
 
     def first_map_load(self):
         for source_view in self:

src/core/widgets/code/controllers/views/states/source_view_multi_insert_state.py

@@ -59,56 +59,30 @@ class SourceViewsMultiInsertState(SourceViewsBaseState):
             buffer.insert(start_itr, text, -1)
 
         self.marker_manager.apply_to_marks(buffer, replace_word)
-
         return True
 
-    def move_cursor(
+    def move_cursor(self, source_view, step, count, is_selection, emit):
-        self, source_view, step, count, is_selection,
-        emit = None, ignore_leader: bool = False
-    ):
         is_forward = count > 0
         buffer     = source_view.get_buffer()
 
-        start_mark    = buffer.get_insert()
+        if step in [
-        end_mark      = buffer.get_selection_bound()
+            Gtk.MovementStep.LOGICAL_POSITIONS,
-        start_itr     = buffer.get_iter_at_mark(start_mark)
+            Gtk.MovementStep.VISUAL_POSITIONS
-        end_itr       = buffer.get_iter_at_mark(end_mark)
+        ]:
-        has_selection = not start_itr.equal(end_itr)
+            self.marker_manager.move_by_char(buffer, is_forward, is_selection)
+        elif step == Gtk.MovementStep.WORDS:
+            self.marker_manager.move_by_word(buffer, is_forward, is_selection)
+        elif step == Gtk.MovementStep.DISPLAY_LINES:
+            self.marker_manager.move_by_line(buffer, is_forward, is_selection)
 
-        step_map      = {
+        self._signal_cursor_moved(source_view, emit)
-            Gtk.MovementStep.LOGICAL_POSITIONS: ("char", self.marker_manager.move_by_char),
-            Gtk.MovementStep.VISUAL_POSITIONS:  ("char", self.marker_manager.move_by_char),
-            Gtk.MovementStep.WORDS:             ("word", self.marker_manager.move_by_word),
-            Gtk.MovementStep.DISPLAY_LINES:     ("line", self.marker_manager.move_by_line),
-        }
 
-        kind, move_fn = step_map[step]
+        return False
-        move_fn(buffer, is_forward, is_selection)
-
-        if ignore_leader: return True
-
-        self.marker_manager._proc_move(
-            buffer,
-            is_forward,
-            is_selection,
-            kind,
-            None,
-            start_mark,
-            end_mark,
-            has_selection,
-            start_itr,
-            end_itr,
-        )
-
-        # self._signal_cursor_moved(source_view, emit)
-
-        return True
 
     def key_press_event(self, source_view, event, key_mapper):
         char = key_mapper.get_raw_keyname(event).upper()
         self.is_control = key_mapper.is_control(event)
         self.is_shift   = key_mapper.is_shift(event)
-        self.is_super   = key_mapper.is_super(event)
 
         if char.upper() in ["BACKSPACE", "DELETE", "ENTER"]:
             self.marker_manager.process_cursor_action(
@@ -117,9 +91,6 @@ class SourceViewsMultiInsertState(SourceViewsBaseState):
             )
             return False
 
-        if self._do_cursor_moved(source_view, char):
-            return True
-
         return super().key_press_event(source_view, event, key_mapper)
 
     def button_press_event(self, source_view, event):
@@ -128,56 +99,6 @@ class SourceViewsMultiInsertState(SourceViewsBaseState):
     def button_release_event(self, source_view, event):
         self.marker_manager.button_release_event(source_view, event)
 
-    def _do_cursor_moved(self, source_view, char: str):
-        key = char.upper()
-        if key not in {"LEFT", "RIGHT", "UP", "DOWN"}: return False
-
-        direction = {
-            "LEFT":  -1,
-            "RIGHT":  1,
-            "UP":    -1,
-            "DOWN":   1,
-        }[key]
-
-        is_horizontal = key in {"LEFT", "RIGHT"}
-
-        step  = \
-            Gtk.MovementStep.VISUAL_POSITIONS if is_horizontal else Gtk.MovementStep.DISPLAY_LINES
-        count = direction
-        is_selection = self.is_shift
-
-        if is_horizontal:
-            if self.is_control:
-                step = Gtk.MovementStep.WORDS
-            if self.is_control and self.is_shift:
-                is_selection = True
-            if self.is_super:
-                return self.move_cursor(
-                    source_view,
-                    step,
-                    count,
-                    is_selection  = False,
-                    emit          = None,
-                    ignore_leader = True,
-                )
-        else:
-            if self.is_super:
-                return self.move_cursor(
-                    source_view,
-                    step,
-                    count,
-                    is_selection,
-                    emit          = None,
-                    ignore_leader = True,
-                )
-
-        return self.move_cursor(
-            source_view,
-            step         = step,
-            count        = count,
-            is_selection = is_selection,
-        )
-
     def _signal_cursor_moved(self, source_view, emit):
         buffer = source_view.get_buffer()
         itr    = buffer.get_iter_at_mark( buffer.get_insert() )

src/core/widgets/code/key_mapper.py

@@ -161,10 +161,6 @@ class KeyMapper:
         modifiers  = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK)
         return modifiers & Gdk.ModifierType.SHIFT_MASK
 
-    def is_super(self, eve):
-        modifiers  = Gdk.ModifierType(eve.get_state() & ~Gdk.ModifierType.LOCK_MASK)
-        return modifiers & Gdk.ModifierType.SUPER_MASK
-
     def get_raw_keyname(self, eve) -> str:
         return Gdk.keyval_name(eve.keyval)
 

src/core/widgets/code/mixins/command_system_mixin.py

@@ -4,19 +4,12 @@
 
 # Application imports
 from libs.event_factory import Event_Factory, Code_Event_Types
-from libs.command_system import CommandSystem
 
 from ..source_view import SourceView
 
 
-from . import commands
-
-
-
-class SourceViewCommandSystem(CommandSystem):
-    def __init__(self):
-        super(SourceViewCommandSystem, self).__init__(commands)
 
+class CommandSystemMixin:
     def toggle_plugins_ui(self):
         event = Event_Factory.create_event( "toggle_plugins_ui" )
 
@@ -88,11 +81,3 @@ class SourceViewCommandSystem(CommandSystem):
         )
 
         self.emit_to("completion", event)
-
-    def emit(self, event: Code_Event_Types.CodeEvent):
-        """ Monkey patch 'emit' from command controller... """
-        ...
-
-    def emit_to(self, controller: str, event: Code_Event_Types.CodeEvent):
-        """ Monkey patch 'emit_to' from command controller... """
-        ...

src/core/widgets/code/mixins/source_view_dnd_mixin.py

@@ -3,10 +3,7 @@
 # Lib imports
 import gi
 gi.require_version('Gtk', '3.0')
-#gi.require_version('Gdk', '3.0')
 from gi.repository import Gtk
-#from gi.repository import Gdk
-
 
 # Application imports
 
@@ -15,41 +12,25 @@ from gi.repository import Gtk
 class SourceViewDnDMixin:
 
     def _set_up_dnd(self):
-        URI_TARGET_TYPE        = 10
+        PLAIN_TEXT_TARGET_TYPE = 70
-        PLAIN_TEXT_TARGET_TYPE = 50
+        URI_TARGET_TYPE        = 80
-
+        text_target = Gtk.TargetEntry.new('text/plain', Gtk.TargetFlags(0), PLAIN_TEXT_TARGET_TYPE)
-        uri_target  = Gtk.TargetEntry.new(
+        uri_target  = Gtk.TargetEntry.new('text/uri-list', Gtk.TargetFlags(0), URI_TARGET_TYPE)
-            'text/uri-list', Gtk.TargetFlags(0), URI_TARGET_TYPE
+        targets     = [ text_target, uri_target ]
-        )
-        text_target = Gtk.TargetEntry.new(
-            'text/plain', Gtk.TargetFlags(0), PLAIN_TEXT_TARGET_TYPE
-        )
-        targets     = Gtk.TargetList.new([ uri_target, text_target ])
 
         self.drag_dest_set_target_list(targets)
 
-    def _on_drag_data_received(
+    def _on_drag_data_received(self, widget, drag_context, x, y, data, info, time):
-        self, widget, drag_context, x, y, data, info, time
+        if info == 70: return
-    ):
-        target = data.get_target().name()
 
-        if (info == 10) or (target == "text/uri-list"):
+        if info == 80:
             uris = data.get_uris()
+
             if not uris:
                 uris = data.get_text().split("\n")
 
             self._on_uri_data_received(uris)
 
-            drag_context.finish(True, False, time)
-
-            return
-        elif (info == 50) or (target == "text/plain"):
-            ...
-        else:
-            logger.info(f"DnD Dropped File Type: {target}")
-
-        drag_context.finish(False, False, time)
-
     def _on_uri_data_received(self, uris: list[str]):
             uris = self.command.filter_out_loaded_files(uris)
             if not uris: return

src/core/widgets/code/source_file.py

@@ -155,10 +155,9 @@ class SourceFile(GtkSource.File):
         self.buffer.unblock_modified_changed_signal()
 
     def is_externally_modified(self) -> bool:
-        if self.fname == "buffer": return
-
         stat    = os.stat(self.fpath)
         current = (stat.st_mtime_ns, stat.st_size)
+
         is_modified = \
             hasattr(self, "last_state") and not current == self.last_state
 
@@ -170,12 +169,7 @@ class SourceFile(GtkSource.File):
         loaded, contents, etag_out = gfile.load_contents()
         if not loaded: raise Exception("File couldn't be loaded...'")
 
-        # Note:
+        text         = contents.decode("UTF-8")
-        # "strict" (default) -> raises an error on invalid bytes
-        # "ignore"           -> skips invalid bytes entirely
-        # "replace"          -> replaces invalid bytes with <20>
-        # "backslashreplace" -> uses escape sequences like \xFF
-        text         = contents.decode("UTF-8", errors = "replace")
         info         = gfile.query_info('standard::content-type', Gio.FileQueryInfoFlags.NONE, None)
         content_type = info.get_content_type()
         self.ftype   = Gio.content_type_get_mime_type(content_type) \
@@ -183,7 +177,6 @@ class SourceFile(GtkSource.File):
                         .replace("text/", "") \
                         .replace("x-", "")
 
-        del contents
         self.set_path(gfile)
         logger.debug(f"File content type: {self.ftype}")
         self._load_data(text)

src/libs/command_system.py

@@ -1,50 +0,0 @@
-# Python imports
-import types
-
-# Lib imports
-
-# Application imports
-from .event_factory import Event_Factory, Code_Event_Types
-
-
-
-class CommandSystem:
-    def __init__(self, commands: dict | types.ModuleType):
-        super(CommandSystem, self).__init__()
-
-        self.commands: dict | types.ModuleType = commands
-        self.data: tuple    = ()
-
-
-    def set_data(self, *args, **kwargs):
-        self.data = (args, kwargs)
-
-    def exec(self, command: str) -> any:
-        """
-            The 'exec' method passes the default 'self.data' to commands where custom args are not needed.
-            Ex: The 'code' widget has many internally created commands that
-            only need 'source_view' and so 'set_data' is called to set that.
-        """
-        if not hasattr(self.commands, command): return
-        method = getattr(self.commands, command)
-
-        args, kwargs = self.data
-        return method.execute(*args, **kwargs)
-
-    def exec_with_args(self, command: str, *args, **kwargs) -> any:
-        """
-            The 'exec_with_args' method passes custom args with the understanding
-            that the recipient has proper method signature to accept it- whether
-            *args or **kwargs or something else entirely.
-        """
-        if not hasattr(self.commands, command): return
-
-        method = getattr(self.commands, command)
-        return method.execute(*args, **kwargs)
-
-    def add_command(self, command_name: str, command: callable):
-        setattr(self.commands, command_name, command)
-
-    def remove_command(self, command_name: str, command: callable):
-        if hasattr(self.commands, command_name):
-            delattr(self.commands, command_name)

src/libs/dto/code/events/__init__.py

@@ -6,9 +6,6 @@
 from .code_event import CodeEvent
 from .toggle_plugins_ui_event import TogglePluginsUiEvent
 from .create_source_view_event import CreateSourceViewEvent
-from .created_source_view_event import CreatedSourceViewEvent
-from .remove_source_view_event import RemoveSourceViewEvent
-from .removed_source_view_event import RemovedSourceViewEvent
 from .register_completer_event import RegisterCompleterEvent
 from .unregister_completer_event import UnregisterCompleterEvent
 from .register_provider_event import RegisterProviderEvent
@@ -23,7 +20,7 @@ from .filter_out_loaded_files_event import FilterOutLoadedFilesEvent
 from .get_active_view_event import GetActiveViewEvent
 from .get_source_views_event import GetSourceViewsEvent
 
-from .create_command_system_event import CreateCommandSystemEvent
+from .get_new_command_system_event import GetNewCommandSystemEvent
 from .request_completion_event import RequestCompletionEvent
 from .cursor_moved_event import CursorMovedEvent
 from .modified_changed_event import ModifiedChangedEvent

src/libs/dto/code/events/created_source_view_event.py

@@ -1,14 +0,0 @@
-# Python imports
-from dataclasses import dataclass
-
-# Lib imports
-
-# Application imports
-from .code_event import CodeEvent
-from libs.dto.states.source_view_states import SourceViewStates
-
-
-
-@dataclass
-class CreatedSourceViewEvent(CodeEvent):
-    ...

src/libs/dto/code/events/get_new_command_system_event.py

@@ -9,5 +9,5 @@ from .code_event import CodeEvent
 
 
 @dataclass
-class CreateCommandSystemEvent(CodeEvent):
+class GetNewCommandSystemEvent(CodeEvent):
     ...

src/libs/dto/code/events/remove_source_view_event.py

@@ -1,14 +0,0 @@
-# Python imports
-from dataclasses import dataclass
-
-# Lib imports
-
-# Application imports
-from .code_event import CodeEvent
-from libs.dto.states.source_view_states import SourceViewStates
-
-
-
-@dataclass
-class RemoveSourceViewEvent(CodeEvent):
-    ...

src/libs/dto/code/events/removed_source_view_event.py

@@ -1,14 +0,0 @@
-# Python imports
-from dataclasses import dataclass
-
-# Lib imports
-
-# Application imports
-from .code_event import CodeEvent
-from libs.dto.states.source_view_states import SourceViewStates
-
-
-
-@dataclass
-class RemovedSourceViewEvent(CodeEvent):
-    ...

src/libs/dto/plugins/manifest.py

@@ -13,11 +13,9 @@ from .requests import Requests
 class Manifest:
     name: str          = ""
     author: str        = ""
-    description: str   = ""
+    credit: str        = ""
     version: str       = "0.0.1"
     support: str       = "support@mail.com"
-    credit: str        = ""
-    copyright: str     = "GPLv2"
     pre_launch: bool   = False
     autoload: bool     = True
     requests: Requests = field(default_factory = lambda: Requests())

src/plugins/manifest_manager.py

@@ -56,7 +56,7 @@ class ManifestManager:
 
             if not manifest.autoload:
                 self.manual_launch_manifests.append(manifest_meta)
-                return manifest_meta
+                return
 
             if manifest.pre_launch:
                 self.pre_launch_manifests.append(manifest_meta)

src/plugins/plugin_reload_mixin.py

@@ -48,14 +48,14 @@ class PluginReloadMixin:
 
     def remove_plugin(self, file: str) -> None:
         logger.info(f"Removing plugin: {file.get_uri()}")
-
+        for manifest_meta in self._plugin_collection[:]:
-        manifests = self._manifest_manager.pre_launch_manifests    \
-                    + self._manifest_manager.post_launch_manifests \
-                    + self._manifest_manager.manual_launch_manifests
-
-        for manifest_meta in manifests:
             if not manifest_meta.folder in file.get_uri(): continue
 
+            manifest_meta.instance.unload()
+            manifest_meta.instance = None
+            self._plugin_collection.remove(manifest_meta)
+            self.plugins_ui.remove_row(manifest_meta)
+
             if manifest_meta in self._manifest_manager.pre_launch_manifests:
                 self._manifest_manager.pre_launch_manifests.remove(manifest_meta)
             elif manifest_meta in self._manifest_manager.post_launch_manifests:
@@ -63,15 +63,4 @@ class PluginReloadMixin:
             elif manifest_meta in self._manifest_manager.manual_launch_manifests:
                 self._manifest_manager.manual_launch_manifests.remove(manifest_meta)
 
-            self.plugins_ui.remove_row(manifest_meta)
-            break
-
-        del manifests
-        for manifest_meta in self._plugin_collection[:]:
-            if not manifest_meta.folder in file.get_uri(): continue
-
-            manifest_meta.instance.unload()
-            manifest_meta.instance = None
-            self._plugin_collection.remove(manifest_meta)
-
             break

src/plugins/plugins_ui.py

@@ -76,7 +76,6 @@ class PluginsUI(Gtk.Dialog):
 
         toggle_bttn.toggle_id = \
             toggle_bttn.connect("toggled", callback, manifest_meta)
-        box.toggle_bttn = toggle_bttn
 
         box.add(plugin_lbl)
         box.add(author_lbl)
@@ -97,5 +96,5 @@ class PluginsUI(Gtk.Dialog):
             toggle_bttn.disconnect(toggle_bttn.toggle_id)
 
             self.list_box.remove(row)
-            child.destroy()
+            box.destroy()
             break

user_config/usr/share/app_name/code-key-bindings.json

@@ -42,8 +42,17 @@
         "save_file_as": {
             "released": "<Control><Shift>s"
         },
-        "toggle_plugins_ui": {
+        "focus_left_sibling": {
-            "released": "<Control><Shift>p"
+            "released": "<Control>Page_Up"
+        },
+        "focus_right_sibling": {
+            "released": "<Control>Page_Down"
+        },
+        "move_to_left_sibling": {
+            "released": "<Control><Shift>Up"
+        },
+        "move_to_right_sibling": {
+            "released": "<Control><Shift>Down"
         }
     }
 }