nrepl: order session tags, current session should go first

binaryage · Sep 28, 2016 · 5fd913e · 5fd913e
1 parent 7254c52
commit 5fd913e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/nrepl/dirac/nrepl/sessions.clj b/src/nrepl/dirac/nrepl/sessions.clj
@@ -79,15 +79,17 @@
 (defn get-dirac-session-tag [session]
   (prepare-dirac-session-descriptor-tag (find-dirac-session-descriptor session)))
 
-(defn get-dirac-session-tags []
-  (get-dirac-session-descriptors-tags @state/session-descriptors))
-
 (defn get-other-sessions-descriptors
-  ([] (get-other-sessions-descriptors (state/get-current-session)))
+  ([] (get-other-sessions-descriptors (state/get-current-session-if-avail)))
   ([session]
-   (assert session)
    (remove #(= session (get-dirac-session-descriptor-session %)) @state/session-descriptors)))
 
+(defn get-dirac-session-tags []
+  (let [current-session-descriptor (find-dirac-session-descriptor (state/get-current-session-if-avail))
+        other-descriptors (get-other-sessions-descriptors)
+        ordered-descriptors (keep identity (concat [current-session-descriptor] other-descriptors))]
+    (get-dirac-session-descriptors-tags ordered-descriptors)))
+
 ; -- joining sessions -------------------------------------------------------------------------------------------------------
 
 (defn make-joined-session-descriptor [matcher-fn info]

diff --git a/src/nrepl/dirac/nrepl/state.clj b/src/nrepl/dirac/nrepl/state.clj
@@ -53,6 +53,9 @@
   (assert *current-session*)
   *current-session*)
 
+(defn get-current-session-if-avail []
+  *current-session*)
+
 (defn get-session-binding-value
   ([var] (get-session-binding-value *current-session* var))
   ([session var]