Detect .shadow-cljs/nrepl.port and .shadow-cljs/socket-repl.port

Author: tonsky

CHANGELOG.md

@@ -19,6 +19,7 @@ Other changes:
 - Removed separate EDN syntax, merged with main Clojure (Sublimed)
 - Settings can now be specified in main `Preferences.sublime-settings` as well. Just prepend `clojure_sublimed_` to each setting’s name.
 - REPL can detect namespaces with meta on ns form
+- Detect `.shadow-cljs/nrepl.port` and `.shadow-cljs/socket-repl.port`
 
 ### 3.8.0 - Aug 8, 2024
 

cs_conn.py

@@ -147,8 +147,8 @@ def set_status(self, phase, message, *args):
         cs_common.set_status(self.window, status_key, status)
 
 class AddressInputHandler(sublime_plugin.TextInputHandler):
-    def __init__(self, port_file = None, next_input = None):
-        self.port_file = port_file
+    def __init__(self, port_files = [], next_input = None):
+        self.port_files = port_files
         self.next = next_input
 
     """
@@ -159,13 +159,14 @@ def placeholder(self):
 
     def initial_text(self):
         # .nrepl-port file present
-        if self.port_file and (window := sublime.active_window()):
+        if self.port_files and (window := sublime.active_window()):
             for folder in window.folders():
-                if os.path.exists(folder + "/" + self.port_file):
-                    with open(folder + "/" + self.port_file, "rt") as f:
-                        content = f.read(10).strip()
-                        if re.fullmatch(r'[1-9][0-9]*', content):
-                            return f'localhost:{content}'
+                for port_file in self.port_files:
+                    if os.path.exists(folder + "/" + port_file):
+                        with open(folder + "/" + port_file, "rt") as f:
+                            content = f.read(10).strip()
+                            if re.fullmatch(r'[1-9][0-9]*', content):
+                                return f'localhost:{content}'
         state = cs_common.get_state()
         return state.last_conn[1]['address'] if state.last_conn else 'localhost:'
 

cs_conn_nrepl_jvm.py

@@ -140,11 +140,12 @@ def run(self, address):
         state = cs_common.get_state(self.window)
         state.last_conn = ('clojure_sublimed_connect_nrepl_jvm', {'address': address})
         if address == 'auto':
-            address = cs_conn.AddressInputHandler(port_file = '.nrepl-port').initial_text()
+            address = self.input({}).initial_text()
         ConnectionNreplJvm(address).connect()
 
     def input(self, args):
-        return cs_conn.AddressInputHandler(port_file = '.nrepl-port')
+        if 'address' not in args:
+            return cs_conn.AddressInputHandler(port_files = ['.nrepl-port', '.shadow-cljs/nrepl.port'])
 
     def is_enabled(self):
         state = cs_common.get_state(self.window)

cs_conn_nrepl_raw.py

@@ -164,11 +164,12 @@ def run(self, address):
         state = cs_common.get_state(self.window)
         state.last_conn = ('clojure_sublimed_connect_nrepl_raw', {'address': address})
         if address == 'auto':
-            address = cs_conn.AddressInputHandler(port_file = '.nrepl-port').initial_text()
+            address = self.input({}).initial_text()
         ConnectionNreplRaw(address).connect()
 
     def input(self, args):
-        return cs_conn.AddressInputHandler(port_file = '.nrepl-port')
+        if 'address' not in args:
+            return cs_conn.AddressInputHandler(port_files = ['.nrepl-port', '.shadow-cljs/nrepl.port'])
 
     def is_enabled(self):
         state = cs_common.get_state(self.window)

cs_conn_shadow_cljs.py

@@ -91,10 +91,14 @@ def run(self, address, build):
         ConnectionShadowCljs(address, build).connect()
 
     def input(self, args):
-        if 'build' not in args:
-            return cs_conn.AddressInputHandler(next_input = BuildInputHandler())
+        if 'address' in args and 'build' in args:
+            pass
+        elif 'address' in args:
+            return BuildInputHandler()
+        elif 'build' in args:
+            return cs_conn.AddressInputHandler(port_files = ['.nrepl-port', '.shadow-cljs/nrepl.port'])
         else:
-            return cs_conn.AddressInputHandler()
+            return cs_conn.AddressInputHandler(port_files = ['.nrepl-port', '.shadow-cljs/nrepl.port'], next_input = BuildInputHandler())
 
     def is_enabled(self):
         state = cs_common.get_state(self.window)

cs_conn_socket_repl.py

@@ -200,11 +200,12 @@ def run(self, address):
         state = cs_common.get_state(self.window)
         state.last_conn = ('clojure_sublimed_connect_socket_repl', {'address': address})
         if address == 'auto':
-            address = cs_conn.AddressInputHandler(port_file = '.repl-port').initial_text()
+            address = self.input({}).initial_text()
         ConnectionSocketRepl(address).connect()
 
     def input(self, args):
-        return cs_conn.AddressInputHandler(port_file = '.repl-port')
+        if 'address' not in args:
+            return cs_conn.AddressInputHandler(port_files = ['.repl-port', '.shadow-cljs/socket-repl.port'])
 
     def is_enabled(self):
         state = cs_common.get_state(self.window)