Settings can now be specified in main Settings file

Author: tonsky

CHANGELOG.md

@@ -2,8 +2,7 @@
 
 Syntax has been significantly reworked.
 
-- New syntax that can highlight reader comments `comment.reader` together with the following
-  form
+- New syntax that can highlight reader comments `comment.reader` together with the following form
 - Highlight `(comment ...)` blocks as `comment.form`
 - Highlight namespaces in symbols as `meta.namespace.symbol`
 - Highlight unused symbols as `source.symbol.unused`
@@ -15,6 +14,7 @@ Syntax has been significantly reworked.
 Other changes:
 
 - Allow using `cljfmt` for formatting (requires `cljfmt` binary on `$PATH`)
+- Settings can now be specified in main `Preferences.sublime-settings` as well. Just prepend `clojure_sublimed_` to each setting’s name.
 
 ### 3.8.0 - Aug 8, 2024
 

README.md

@@ -297,6 +297,20 @@ Finally, to clear evaluation results run `Clojure Sublimed: Clear Evaluation Res
 
 To edit settings, run `Preferences: Clojure Sublimed Settings` command.
 
+If you prefer setting settings in main file, you can do so by prepending `"clojure_sublimed_"` to each setting name. E.g.
+
+```
+"debug": True,
+```
+
+in `Clojure Sublimed.sublime-settings` becomes
+
+```
+"clojure_sublimed_debug": True,
+```
+
+in `Preferences.sublime-settings`. Settings from `Preferences.sublime-settings` take priority.
+
 ## Session-wide settings
 
 It is sometimes desirable to set dynamic Clojure vars for the whole session. To do that, edit `"eval_shared"` setting. For example:

cs_common.py

@@ -38,25 +38,36 @@ def settings():
     """
     return sublime.load_settings("Clojure Sublimed.sublime-settings")
 
+def main_settings():
+    return sublime.load_settings("Preferences.sublime-settings")
+
 def setting(key, default = None):
     """
     Shortcut to get value of a particular plugin setting
     """
-    return settings().get(key, default)
+    s = main_settings()
+    if s and (res := s.get("clojure_sublimed_" + key)) is not None:
+        return res
+    s = settings()
+    if s and (res := s.get(key)) is not None:
+        return res
+    return default
 
 def on_settings_change(tag, callback):
     """
     Subscribe to settings change
     """
-    settings().add_on_change(tag, lambda: callback(settings()))
-    callback(settings())
+    main_settings().add_on_change(tag, callback)
+    settings().add_on_change(tag, callback)
+    callback()
 
 def clear_settings_change(tag):
     """
     Unsubscribe from settings change
     """
+    main_settings().clear_on_change(tag)
     settings().clear_on_change(tag)
-
+    
 def wrap_width(view):
     if (w := setting('wrap_width')):
         return w
@@ -257,7 +268,7 @@ def plugin_loaded():
     elif os.path.isdir(package_path):
         # Package is a directory, so get its basename
         package = os.path.basename(package_path)
-    on_settings_change(__name__, lambda _: colors.clear())
+    on_settings_change(__name__, lambda: colors.clear())
 
 def plugin_unloaded():
     for state in states.values(): 

cs_progress.py

@@ -14,9 +14,11 @@ def __init__(self):
         self.interval = 100
 
     def update_phases(self, phases, interval):
-        self.phases = phases
+        if phases is not None:
+            self.phases = phases
         self.phase_idx = 0
-        self.interval = interval
+        if interval is not None:
+            self.interval = interval
         if len(phases) > 1:
             self.start()
         else:
@@ -26,9 +28,7 @@ def phase(self):
         return self.phases[self.phase_idx]
 
     def run_loop(self):
-        settings = cs_common.settings()
-        if settings.to_dict():
-            self.update_phases(settings.get("progress_phases"), settings.get("progress_interval_ms"))
+        thread.update_phases(cs_common.setting("progress_phases"), cs_common.setting("progress_interval_ms"))
         while True:
             if not self.running:
                 break
@@ -74,9 +74,8 @@ def on_activated_async(self, view):
         """
         thread.wake()
 
-def on_settings_change(settings):
-    if settings.to_dict():
-        thread.update_phases(settings.get("progress_phases"), settings.get("progress_interval_ms"))
+def on_settings_change():
+    thread.update_phases(cs_common.setting("progress_phases"), cs_common.setting("progress_interval_ms"))
 
 def plugin_loaded():
     cs_common.on_settings_change(__name__, on_settings_change)