Load the package settings through a shared module

`session.py`, `setup.py` and `keystate_helper.py` each defined their own
`_SETTINGS_FILE` constant. `plugin/settings.py` now holds the file name
together with `load_settings()` and `save_settings()` accessors.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: FichteFoll

plugin/ctrl_release/linux/keystate_helper.py

@@ -10,12 +10,13 @@
 
 import sublime
 
+from ...settings import load_settings
+
 HANDSHAKE = "tabstack-keystate 2"
 DEFAULT_HELPER_PATH = "/usr/local/libexec/tabstack-keystate"
 DEFAULT_CTRL_KEYS = ("leftctrl", "rightctrl")
 
 _HANDSHAKE_PREFIX = "tabstack-keystate "
-_SETTINGS_FILE = "TabStack.sublime-settings"
 _SETTINGS_WATCH_KEY = "tab_stack_keystate_helper"
 _PROBE_TIMEOUT_S = 2
 _EXIT_TIMEOUT_S = 1
@@ -52,14 +53,14 @@ def command(self) -> list[str]:
 
 
 def helper_path() -> str:
-    path = sublime.load_settings(_SETTINGS_FILE).get("keystate_helper_path", DEFAULT_HELPER_PATH)
+    path = load_settings().get("keystate_helper_path", DEFAULT_HELPER_PATH)
     if not isinstance(path, str) or not path:
         path = DEFAULT_HELPER_PATH
     return os.path.expanduser(path)
 
 
 def helper_ctrl_keys() -> tuple[str, ...]:
-    keys: object = sublime.load_settings(_SETTINGS_FILE).get("keystate_ctrl_keys")
+    keys: object = load_settings().get("keystate_ctrl_keys")
     if not isinstance(keys, list) or not keys:
         return DEFAULT_CTRL_KEYS
     # The helper validates the names against its allowlist and reports a usage error.
@@ -191,7 +192,7 @@ def on_settings_changed() -> None:
         if _helper_config() != _probed_config:
             on_invalidated()
 
-    sublime.load_settings(_SETTINGS_FILE).add_on_change(_SETTINGS_WATCH_KEY, on_settings_changed)
+    load_settings().add_on_change(_SETTINGS_WATCH_KEY, on_settings_changed)
 
 
 def _invalidate_probe(probe: HelperProbe) -> None:
@@ -333,6 +334,6 @@ def _terminate(self, process: subprocess.Popen[str]) -> None:
 
 def plugin_unloaded() -> None:
     global _on_invalidated
-    sublime.load_settings(_SETTINGS_FILE).clear_on_change(_SETTINGS_WATCH_KEY)
+    load_settings().clear_on_change(_SETTINGS_WATCH_KEY)
     _on_invalidated = None
     reset_helper_probe()

plugin/session.py

@@ -4,6 +4,7 @@
 
 from .constants import KIND_MODIFIED
 from .ctrl_release import create_poller
+from .settings import load_settings
 from .sheets import apply_group_selection
 from .state import TabStackWindowState
 
@@ -12,8 +13,6 @@
 CTRL_STATE_TIMEOUT_MS = 1000
 CTRL_STATE_RETRY_MS = 10
 
-_SETTINGS_FILE = "TabStack.sublime-settings"
-
 
 def _ensure_ctrl_release_poller(window: sublime.Window, state: TabStackWindowState) -> None:
     if state.ctrl_release_poller:
@@ -47,7 +46,7 @@ def show_panel(window: sublime.Window, state: TabStackWindowState) -> None:
         for entry in entries
     ]
 
-    preview_tabs = bool(sublime.load_settings(_SETTINGS_FILE).get("preview_tabs", True))
+    preview_tabs = bool(load_settings().get("preview_tabs", True))
 
     def on_select(index: int) -> None:
         if index < 0:

plugin/settings.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+import sublime
+
+SETTINGS_FILE = "TabStack.sublime-settings"
+
+
+def load_settings() -> sublime.Settings:
+    return sublime.load_settings(SETTINGS_FILE)
+
+
+def save_settings() -> None:
+    sublime.save_settings(SETTINGS_FILE)

plugin/setup.py

@@ -13,13 +13,13 @@
     HelperStatus,
     get_helper_probe,
 )
+from .settings import load_settings, save_settings
 
 __all__ = ["TabStackReplaceContentsCommand", "TabStackSetupKeystateHelperCommand"]
 
 assert __package__ is not None
 # This module lives in the `plugin` subpackage; resources are addressed by the top-level package.
 _PACKAGE_NAME = __package__.split(".")[0]
-_SETTINGS_FILE = "TabStack.sublime-settings"
 _SOURCE_NAME = "tabstack-keystate.c"
 _SETUP_COMMAND = "tab_stack_setup_keystate_helper"
 _SETUP_CAPTION = "TabStack: Set Up Ctrl Detection for Wayland"
@@ -91,7 +91,7 @@ def offer_wayland_setup(window: sublime.Window) -> bool:
     if get_helper_probe() is None:
         # The background probe has not finished; the helper may still turn out to work.
         return False
-    settings = sublime.load_settings(_SETTINGS_FILE)
+    settings = load_settings()
     if not settings.get("show_wayland_setup_dialog", True):
         return False
 
@@ -105,7 +105,7 @@ def offer_wayland_setup(window: sublime.Window) -> bool:
         window.run_command(_SETUP_COMMAND)
     elif result == sublime.DIALOG_NO:
         settings.set("show_wayland_setup_dialog", False)
-        sublime.save_settings(_SETTINGS_FILE)
+        save_settings()
     return True