Skip to content

Commit 6909281

Browse files
Revert to 5467e00
1 parent d9515e2 commit 6909281

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

autoload/jack_in.vim

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

6767
function! jack_in#clj_cmd(...)
6868
let l:clj_string = 'clj'
69-
let l:main_fn = '-M -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 ''['
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\" \"['
7471

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

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
77+
let l:deps_map .= '}}'
78+
let l:cider_opts .= ']\")"'
8479

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

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

0 commit comments

Comments
 (0)