4.4.2 Get settings from view, which merges in project and syntax settings on top of Preferences.sublime-settings

Author: tonsky

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 4.4.2 - Apr 28, 2025
+
+- Get settings from view, which merges in project and syntax settings on top of `Preferences.sublime-settings`
+
 ### 4.4.1 - Apr 5, 2025
 
 - Autoscroll on Enter #135

Clojure Sublimed Dark.sublime-color-scheme

@@ -3,7 +3,7 @@
     "author": "Nikita Prokopov",
     "variables":
     {
-        "active":     "#CD974B",
+        "active":     "#00BFFF",
         "fg":         "#CECECE",
         "bg":         "#0E1415",
         "blue":       "#71ADE7",

Clojure Sublimed Light.sublime-color-scheme

@@ -3,10 +3,10 @@
     "author": "Nikita Prokopov",
     "variables":
     {
-        "active":     "#007ACC",
-        "fg":         "#000",
-        "bg":         "#fff",
-        "gray":       "#A0A0A0",
+        "active": "#43bef4",
+        "fg":     "#000",
+        "bg":     "#fff",
+        "gray":   "#A0A0A0",
     },
     "globals":
     {
@@ -93,6 +93,10 @@
          "scope":      "meta.quoted - meta.quoted meta.unquoted, meta.quoted meta.unquoted meta.quoted - meta.quoted meta.unquoted meta.quoted meta.unquoted, meta.quoted meta.unquoted meta.quoted meta.unquoted meta.quoted - meta.quoted meta.unquoted meta.quoted meta.unquoted meta.quoted meta.unquoted, meta.quoted comment.reader, meta.quoted punctuation.definition.comment, meta.quoted comment.form, meta.quoted comment.form punctuation",
          "background": "#00000010"},
 
+        {"name":       "JSX",
+         "scope":      "meta.jsx - meta.jsx source.js.embedded, meta.jsx source.js.embedded meta.jsx - meta.jsx source.js.embedded meta.jsx source.js.embedded, meta.jsx source.js.embedded meta.jsx source.js.embedded meta.jsx - meta.jsx source.js.embedded meta.jsx source.js.embedded meta.jsx source.js.embedded",
+         "background": "#00000010"},
+
         {"name":       "Inner brackets",
          "scope":      "meta.parens meta.parens punctuation.section, meta.parens meta.brackets punctuation.section, meta.parens meta.braces punctuation.section, meta.brackets meta.parens punctuation.section, meta.brackets meta.brackets punctuation.section, meta.brackets meta.braces punctuation.section, meta.braces meta.parens punctuation.section, meta.braces meta.brackets punctuation.section, meta.braces meta.braces punctuation.section",
          "foreground": "var(gray)"},

cs_common.py

@@ -32,20 +32,22 @@ def __init__(self, id = None, code = None, ns = 'user', line = None, column = No
         self.file   = file
         self.print_quota = print_quota
 
+def main_settings(view = None):
+    if view := view or sublime.active_window().active_view():
+        return view.settings()
+    return sublime.load_settings("Preferences.sublime-settings")
+
 def settings():
     """
     Plugin settings
     """
     return sublime.load_settings("Clojure Sublimed.sublime-settings")
 
-def main_settings():
-    return sublime.load_settings("Preferences.sublime-settings")
-
-def setting(key, default = None):
+def setting(key, default = None, view = None):
     """
     Shortcut to get value of a particular plugin setting
     """
-    s = main_settings()
+    s = main_settings(view = view)
     if s and (res := s.get("clojure_sublimed_" + key)) is not None:
         return res
     s = settings()

cs_indent.py

@@ -124,7 +124,7 @@ class ClojureSublimedReindentBufferCommand(sublime_plugin.TextCommand):
     def run(self, edit):
         view = self.view
         with cs_common.Measure("Reindent Buffer {} chars", view.size()):
-            if 'cljfmt' == cs_common.setting('formatter'):
+            if 'cljfmt' == cs_common.setting('formatter', view = view):
                 cs_cljfmt.indent_lines(view, [sublime.Region(0, view.size())], edit)
             else:
                 indent_lines(view, [sublime.Region(0, view.size())], edit)
@@ -133,7 +133,7 @@ class ClojureSublimedReindentLinesCommand(sublime_plugin.TextCommand):
     def run(self, edit):
         view = self.view
         with cs_common.Measure("Reindent Lines {} chars", sum([r.size() for r in view.sel()])):
-            if 'cljfmt' == cs_common.setting('formatter'):
+            if 'cljfmt' == cs_common.setting('formatter', view = view):
                 cs_cljfmt.indent_lines(view, view.sel(), edit)
             else:
                 indent_lines(view, view.sel(), edit)
@@ -177,7 +177,7 @@ def cljfmt_indent(view, point):
 class ClojureSublimedInsertNewlineCommand(sublime_plugin.TextCommand):
     def run(self, edit):
         view = self.view
-        newline_indent_fn = cljfmt_indent if 'cljfmt' == cs_common.setting('formatter') else newline_indent
+        newline_indent_fn = cljfmt_indent if 'cljfmt' == cs_common.setting('formatter', view = view) else newline_indent
 
         # Calculate all replacements first
         replacements = []