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

Propagate require error to eval

Browse Source
This commit is contained in:
Tim Pope 2014-01-12 00:13:32 -05:00
parent 0cfa1eed58
commit af245caf76
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugin/fireplace.vim
View File

@ -166,13 +166,18 @@ function! s:repl.require(lib) dict abort
if !empty(a:lib) && a:lib !=# self.user_ns() && !get(self.requires, a:lib) if !empty(a:lib) && a:lib !=# self.user_ns() && !get(self.requires, a:lib)
let reload = has_key(self.requires, a:lib) ? ' :reload' : '' let reload = has_key(self.requires, a:lib) ? ' :reload' : ''
let self.requires[a:lib] = 0 let self.requires[a:lib] = 0
let result = self.eval('(ns '.a:lib.' (:require '.a:lib.reload.'))', {'ns': self.user_ns(), 'session': 0}) let clone = self.try('clone')
try
let result = clone.eval('(ns '.a:lib.' (:require '.a:lib.reload.'))', {'ns': self.user_ns()})
finally
call clone.close()
endtry
let self.requires[a:lib] = !has_key(result, 'ex') let self.requires[a:lib] = !has_key(result, 'ex')
if has_key(result, 'ex') if has_key(result, 'ex')
return result.err return result
endif endif
endif endif
return '' return {}
endfunction endfunction
function! s:repl.includes_file(file) dict abort function! s:repl.includes_file(file) dict abort
@ -342,7 +347,7 @@ function! s:oneoff.eval(expr, options) dict abort
endfunction endfunction
function! s:oneoff.require(symbol) abort function! s:oneoff.require(symbol) abort
return '' return {}
endfunction endfunction
function! s:oneoff.message(symbol) abort function! s:oneoff.message(symbol) abort
@ -405,12 +410,6 @@ function! fireplace#message(payload, ...)
let payload.ns = fireplace#ns() let payload.ns = fireplace#ns()
if fireplace#ns() !=# client.user_ns() if fireplace#ns() !=# client.user_ns()
let error = client.require(fireplace#ns()) let error = client.require(fireplace#ns())
if !empty(error)
echohl ErrorMSG
echo error
echohl NONE
throw "Clojure: couldn't require " . fireplace#ns()
endif
endif endif
endif endif
return call(client.message, [payload] + a:000, client) return call(client.message, [payload] + a:000, client)
@ -485,10 +484,7 @@ function! s:eval(expr, ...) abort
if fireplace#ns() !=# client.user_ns() if fireplace#ns() !=# client.user_ns()
let error = client.require(fireplace#ns()) let error = client.require(fireplace#ns())
if !empty(error) if !empty(error)
echohl ErrorMSG return error
echo error
echohl NONE
throw "Clojure: couldn't require " . fireplace#ns()
endif endif
endif endif
let options.ns = fireplace#ns() let options.ns = fireplace#ns()