From 62dc8625005af2e1be9e1e3dde897e294bd56324 Mon Sep 17 00:00:00 2001 From: stardiviner Date: Tue, 23 Oct 2018 19:23:45 +0800 Subject: [PATCH 2/2] ob-clojure.el: Support new CIDER using sesman to manage sessions. * ob-clojure.el (org-babel-clojure-initiate-session): improve ob-clojure initialize session way to support CIDER new API. * etc/ORG-NEWS: add declare for new :session support feature. --- etc/ORG-NEWS | 11 +++++++++++ lisp/ob-clojure.el | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 811e98147..100f9fd75 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -170,6 +170,17 @@ This is consistent with the naming of =org-dblock-write:columnview= options, where =:match= is also used as a headlines filter. ** New features +*** Add ~:session~ support of ob-clojure for CIDER +You can initialize source block session with Babel default keybinding +=[C-c C-v C-z]= to use =sesman= session manager to link current +project, directory or buffer with specific Clojure session, or +=cider-jack-in= a new CIDER REPL if no CIDER REPLs available. In older +CIDER version which has not =sesman= integrated, only has +=cider-jack-in= without Clojure project is supported. +#+begin_src clojure :session +(dissoc Clojure 'JVM) +(conj clojurists "stardiviner") +#+end_src *** Add ~:results link~ support for Babel With this output format, create a link to the file specified in diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el index 048ba3735..ffac3c149 100644 --- a/lisp/ob-clojure.el +++ b/lisp/ob-clojure.el @@ -46,6 +46,7 @@ (declare-function cider-jack-in "ext:cider" (&optional prompt-project cljs-too)) (declare-function cider-current-connection "ext:cider-client" (&optional type)) (declare-function cider-current-ns "ext:cider-client" ()) +(declare-function cider-repls "ext:cider-connection" (&optional type ensure)) (declare-function nrepl--merge "ext:nrepl-client" (dict1 dict2)) (declare-function nrepl-dict-get "ext:nrepl-client" (dict key)) (declare-function nrepl-dict-put "ext:nrepl-client" (dict key value)) @@ -55,6 +56,8 @@ (defvar nrepl-sync-request-timeout) (defvar cider-buffer-ns) +(defvar sesman-system) +(defvar cider-version) (defvar org-babel-tangle-lang-exts) (add-to-list 'org-babel-tangle-lang-exts '("clojure" . "clj")) @@ -222,7 +225,13 @@ using the :show-process parameter." ((eq org-babel-clojure-backend 'cider) (require 'cider) (let ((session-buffer (save-window-excursion - (cider-jack-in t) + (if (version< cider-version "0.18.0") + ;; older CIDER (without sesman) still need to use old way. + (cider-jack-in nil) ; nil for jack-in without project. + ;; new CIDER (with sesman to manage sessions) + (unless (cider-repls) + (let ((sesman-system 'CIDER)) + (call-interactively 'sesman-link-with-directory)))) (current-buffer)))) (if (org-babel-comint-buffer-livep session-buffer) (progn (sit-for .25) session-buffer)))) -- 2.19.1