Add the Java version to the welcome banner & the connection info

Author: Bozhidar Batsov

cider-interaction.el

@@ -108,6 +108,10 @@ which will use the default REPL connection."
   :group 'cider)
 
 ;;; Connection info
+(defun cider--java-version ()
+  "Retrieve the underlying connection's Java version."
+  (cider-eval-and-get-value "(System/getProperty \"java.version\")"))
+
 (defun cider--clojure-version ()
   "Retrieve the underlying connection's Clojure version."
   (cider-eval-and-get-value "(clojure-version)"))
@@ -122,11 +126,12 @@ which will use the default REPL connection."
 Info contains project name, current REPL namespace, host:port
 endpoint and Clojure version."
   (with-current-buffer (get-buffer connection-buffer)
-    (format "Active nREPL connection: %s:%s, %s:%s (Clojure %s, nREPL %s)"
+    (format "Active nREPL connection: %s:%s, %s:%s (Java %s, Clojure %s, nREPL %s)"
             (or (nrepl--project-name nrepl-project-dir) "<no project>")
             nrepl-buffer-ns
             (car nrepl-endpoint)
             (cadr nrepl-endpoint)
+            (cider--java-version)
             (cider--clojure-version)
             (cider--nrepl-version))))
 

cider-repl.el

@@ -223,10 +223,11 @@ positions before and after executing BODY."
 
 (defun cider-repl--banner ()
   "Generate the welcome REPL buffer banner."
-  (format "; CIDER %s (Clojure %s, nREPL %s)"
+  (format "; CIDER %s (Java %s, Clojure %s, nREPL %s)"
           (condition-case nil
               (pkg-info-version-info 'cider)
             (error cider-version))
+          (cider--java-version)
           (cider--clojure-version)
           (cider--nrepl-version)))
 

test/cider-tests.el

@@ -50,16 +50,18 @@
 
 (ert-deftest test-cider-repl--banner ()
   (noflet ((pkg-info-version-info (library) "0.2.0")
+           (cider--java-version () "1.7")
            (cider--clojure-version () "1.5.1")
            (cider--nrepl-version () "0.2.1"))
-    (should (equal (cider-repl--banner) "; CIDER 0.2.0 (Clojure 1.5.1, nREPL 0.2.1)"))))
+    (should (equal (cider-repl--banner) "; CIDER 0.2.0 (Java 1.7, Clojure 1.5.1, nREPL 0.2.1)"))))
 
 (ert-deftest test-cider-repl--banner-version-fallback ()
   (noflet ((pkg-info-version-info (library) (error "No package version"))
+           (cider--java-version () "1.7")
            (cider--clojure-version () "1.5.1")
            (cider--nrepl-version () "0.2.1"))
           (let ((cider-version "0.5.1"))
-              (should (equal (cider-repl--banner) "; CIDER 0.5.1 (Clojure 1.5.1, nREPL 0.2.1)")))))
+              (should (equal (cider-repl--banner) "; CIDER 0.5.1 (Java 1.7, Clojure 1.5.1, nREPL 0.2.1)")))))
 
 (ert-deftest test-cider-var-info ()
   (noflet ((nrepl-send-request-sync (list)
@@ -127,7 +129,8 @@
      (let ((nrepl-connection-list
             (list (buffer-name a) (buffer-name b) (buffer-name c)))
            (nrepl-connection-buffer nil))
-       (noflet ((cider--clojure-version () "")
+       (noflet ((cider--java-version () "")
+                (cider--clojure-version () "")
                 (cider--nrepl-version () ""))
                (should (equal (buffer-name a) (nrepl-current-connection-buffer)))
                (cider-rotate-connection)
@@ -139,22 +142,24 @@
 
 (ert-deftest test-cider--current-connection-info ()
   (with-temp-buffer
-    (noflet ((cider--clojure-version () "1.5.1")
+    (noflet ((cider--java-version () "1.7")
+             (cider--clojure-version () "1.5.1")
              (cider--nrepl-version () "0.2.1"))
             (setq-local nrepl-endpoint '("localhost" 4005))
             (setq-local nrepl-project-dir "proj")
             (setq-local nrepl-buffer-ns "somens")
             (should (string= (cider--connection-info (buffer-name (current-buffer)))
-                             "Active nREPL connection: proj:somens, localhost:4005 (Clojure 1.5.1, nREPL 0.2.1)")))))
+                             "Active nREPL connection: proj:somens, localhost:4005 (Java 1.7, Clojure 1.5.1, nREPL 0.2.1)")))))
 
 (ert-deftest test-cider-current-connection-info-no-project ()
   (with-temp-buffer
-    (noflet ((cider--clojure-version () "1.5.1")
+    (noflet ((cider--java-version () "1.7")
+             (cider--clojure-version () "1.5.1")
              (cider--nrepl-version () "0.2.1"))
             (setq-local nrepl-endpoint '("localhost" 4005))
             (setq-local nrepl-buffer-ns "somens")
             (should (string= (cider--connection-info (buffer-name (current-buffer)))
-                             "Active nREPL connection: <no project>:somens, localhost:4005 (Clojure 1.5.1, nREPL 0.2.1)")))))
+                             "Active nREPL connection: <no project>:somens, localhost:4005 (Java 1.7, Clojure 1.5.1, nREPL 0.2.1)")))))
 
 (ert-deftest test-nrepl-close ()
   (let ((connections (nrepl-connection-buffers)))