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

Ignore errors on autorequire if namespace created

Browse Source 
Closes #161.
This commit is contained in:
Tim Pope 2014-06-27 13:30:12 -04:00
parent b10259bcca
commit f2b6a2101f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/fireplace.vim
View File

@ -187,8 +187,16 @@ function! s:repl.preload(lib) dict abort
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 clone = s:conn_try(self.connection, 'clone') let clone = s:conn_try(self.connection, 'clone')
if self.user_ns() ==# 'user'
let qsym = s:qsym(a:lib)
let expr = '(when-not (find-ns '.qsym.') (try'
\ . ' (#''clojure.core/load-one '.qsym.' true true)'
\ . ' (catch Exception e (when-not (find-ns '.qsym.') (throw e)))))'
else
let expr = '(ns '.self.user_ns().' (:require '.a:lib.reload.'))'
endif
try try
let result = clone.eval('(ns '.self.user_ns().' (:require '.a:lib.reload.'))', {'ns': self.user_ns()}) let result = clone.eval(expr, {'ns': self.user_ns()})
finally finally
call clone.close() call clone.close()
endtry endtry