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

Better representation of require errors 

Should help with #56.
This commit is contained in:
Tim Pope 2013-03-06 17:15:57 -05:00
parent 5b57f37802
commit 699dff447f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugin/foreplay.vim
View File

@ -146,6 +146,9 @@ function! s:repl.require(lib) dict abort
let self.requires[a:lib] = 0 let self.requires[a:lib] = 0
let result = self.eval('(doto '.s:qsym(a:lib).' (require'.reload.') the-ns)', {'ns': 'user', 'session': 0}) let result = self.eval('(doto '.s:qsym(a:lib).' (require'.reload.') the-ns)', {'ns': 'user', 'session': 0})
let self.requires[a:lib] = !has_key(result, 'ex') let self.requires[a:lib] = !has_key(result, 'ex')
if has_key(result, 'ex')
return result.err
endif
endif endif
return '' return ''
endfunction endfunction
@ -433,7 +436,13 @@ function! s:eval(expr, ...) abort
let client = get(options, 'client', s:client()) let client = get(options, 'client', s:client())
if !has_key(options, 'ns') if !has_key(options, 'ns')
if foreplay#ns() !~# '^\%(user\)$' if foreplay#ns() !~# '^\%(user\)$'
call client.require(foreplay#ns()) let error = client.require(foreplay#ns())
if !empty(error)
echohl ErrorMSG
echo error
echohl NONE
throw "Clojure: couldn't require " . foreplay#ns()
endif
endif endif
let options.ns = foreplay#ns() let options.ns = foreplay#ns()
endif endif