github-migration/vim-fireplace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow sending custom id on eval

Browse Source
This commit is contained in:
Tim Pope 2014-05-05 00:38:30 -04:00
parent 6cea463c97
commit fa7a19140b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/fireplace/nrepl.vim
View File

@ -128,7 +128,11 @@ function! s:nrepl_eval(expr, ...) dict abort
if has_key(options, 'session') if has_key(options, 'session')
let msg.session = options.session let msg.session = options.session
endif endif
let msg.id = fireplace#nrepl#next_id() if has_key(options, 'id')
let msg.id = options.id
else
let msg.id = fireplace#nrepl#next_id()
endif
if has_key(options, 'file_path') if has_key(options, 'file_path')
let msg.op = 'load-file' let msg.op = 'load-file'
let msg['file-path'] = options.file_path let msg['file-path'] = options.file_path

13
plugin/fireplace.vim
View File

@ -412,6 +412,11 @@ function! s:spawning_eval(classpath, expr, ns) abort
let result.err = join(readfile(s:oneoff_err, 'b'), "\n") let result.err = join(readfile(s:oneoff_err, 'b'), "\n")
let result.ex = join(readfile(s:oneoff_ex, 'b'), "\n") let result.ex = join(readfile(s:oneoff_ex, 'b'), "\n")
let result.stacktrace = readfile(s:oneoff_stk) let result.stacktrace = readfile(s:oneoff_stk)
if empty(result.ex)
let result.status = ['done']
else
let result.status = ['eval-error', 'done']
endif
call filter(result, '!empty(v:val)') call filter(result, '!empty(v:val)')
if v:shell_error && get(result, 'ex', '') ==# '' if v:shell_error && get(result, 'ex', '') ==# ''
throw 'Error running Java: '.get(split(captured, "\n"), -1, '') throw 'Error running Java: '.get(split(captured, "\n"), -1, '')
@ -434,8 +439,12 @@ function! s:oneoff.eval(expr, options) dict abort
if !empty(get(a:options, 'session', 1)) if !empty(get(a:options, 'session', 1))
throw 'Fireplace: no live REPL connection' throw 'Fireplace: no live REPL connection'
endif endif
return s:spawning_eval(join(self.path(), has('win32') ? ';' : ':'), let result = s:spawning_eval(join(self.path(), has('win32') ? ';' : ':'),
\ a:expr, get(a:options, 'ns', self.user_ns())) \ a:expr, get(a:options, 'ns', self.user_ns()))
if has_key(a:options, 'id')
let result.id = a:options.id
endif
return result
endfunction endfunction
function! s:oneoff.message(...) abort function! s:oneoff.message(...) abort