Some defensive coding around default settings fallback #109

tonsky · May 5, 2024 · 97573eb · 97573eb
1 parent 8281157
commit 97573eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 3.7.2 - May 5, 2024
+
+- Some defensive coding around default settings fallback #109
+
 ### 3.7.1 - Mar 15, 2024
 
 - Added `expand` argument to `clojure_sublimed_eval` command

diff --git a/cs_conn_nrepl_jvm.py b/cs_conn_nrepl_jvm.py
@@ -64,7 +64,7 @@ def handle_connect(self, msg):
 
         elif 3 == msg.get('id') and 'done' in msg.get('status', []):
             self.set_status(2, 'Adding middlewares...')
-            eval_shared = cs_common.setting('eval_shared')
+            eval_shared = cs_common.setting('eval_shared', '')
             ns = cs_common.ns + '.middleware'
             self.send({'id':               4 if eval_shared else 5,
                        'session':          self.session,

diff --git a/cs_progress.py b/cs_progress.py
@@ -9,7 +9,7 @@ class ProgressThread:
     def __init__(self):
         self.running = False
         self.condition = threading.Condition()
-        self.phases = None
+        self.phases = ["🕐", "🕑", "🕒", "🕓", "🕔", "🕕", "🕖", "🕗", "🕘", "🕙", "🕚", "🕛"]
         self.phase_idx = 0
         self.interval = 100
 
@@ -72,7 +72,7 @@ def on_activated_async(self, view):
         thread.wake()
 
 def on_settings_change(settings):
-    thread.update_phases(settings["progress_phases"], settings["progress_interval_ms"])
+    thread.update_phases(settings.get("progress_phases", ["🕐", "🕑", "🕒", "🕓", "🕔", "🕕", "🕖", "🕗", "🕘", "🕙", "🕚", "🕛"]), settings.get("progress_interval_ms", 100))
 
 def plugin_loaded():
     cs_common.on_settings_change(__name__, on_settings_change)