Skip to content

Commit 40d5567

Browse files
Merge branch 'interactive-repl'
Close #9
2 parents 5467e00 + 800891f commit 40d5567

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

autoload/jack_in.vim

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,23 @@ endfunction
6666

6767
function! jack_in#clj_cmd(...)
6868
let l:clj_string = 'clj'
69-
let l:deps_map = '{:deps {nrepl/nrepl {:mvn/version "0.9.0"} '
70-
let l:cider_opts = '-e "(require ''nrepl.cmdline) (nrepl.cmdline/-main \"--middleware\" \"['
69+
let l:main_fn = '-m nrepl.cmdline'
70+
let l:interactive = '--interactive'
71+
72+
let l:deps = '-Sdeps ''{:deps {nrepl/nrepl {:mvn/version "0.9.0"} '
73+
let l:cider_opts = '--middleware ''['
7174

7275
for [dep, inj] in items(g:jack_in_injections)
73-
let l:deps_map .= dep . ' {:mvn/version "' . inj['version'] . '"} '
74-
let l:cider_opts .= ' '.inj['middleware']
76+
let l:deps .= dep . ' {:mvn/version "' . inj['version'] . '"} '
77+
let l:cider_opts .= ' "'.inj['middleware'] . '"'
7578
endfor
7679

77-
let l:deps_map .= '}}'
78-
let l:cider_opts .= ']\")"'
80+
let l:deps .= '}}'''
81+
let l:cider_opts .= ']'''
82+
83+
let l:cmd = l:clj_string . ' ' . l:deps . ' ' . l:main_fn . ' ' . l:cider_opts . ' ' . l:interactive
7984

80-
return l:clj_string . ' -Sdeps ''' . l:deps_map . ''' ' . join(a:000, ' ') . ' ' . l:cider_opts . ' '
85+
return l:cmd
8186
endfunction
8287

8388
function! jack_in#clj(is_bg, ...)

0 commit comments

Comments
 (0)