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

Provide and use foreplay#evalprint()

Browse Source 
This provides a central point for alternate output methods, such as
capturing to a buffer.

In support of #7.
This commit is contained in:
Tim Pope 2013-01-04 23:35:08 -05:00
parent e62540fef9
commit fbc0c54548
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
plugin/foreplay.vim
View File

@ -408,6 +408,14 @@ function! foreplay#eval(expr) abort
throw err throw err
endfunction endfunction
function! foreplay#evalprint(expr) abort
try
echo foreplay#eval(a:expr)
catch /^Clojure:/
endtry
return ''
endfunction
function! foreplay#evalparse(expr) abort function! foreplay#evalparse(expr) abort
let response = s:eval( let response = s:eval(
\ '(symbol ((fn *vimify [x]' . \ '(symbol ((fn *vimify [x]' .
@ -485,23 +493,16 @@ function! s:printop(type) abort
endfunction endfunction
function! s:print_last() abort function! s:print_last() abort
try call foreplay#evalprint(s:todo)
echo foreplay#eval(s:todo)
catch /^Clojure:/
endtry
return '' return ''
endfunction endfunction
function! s:editop(type) abort function! s:editop(type) abort
call feedkeys(&cedit . "\<Home>", 'n') call feedkeys(&cedit . "\<Home>", 'n')
let input = s:input(substitute(substitute(s:opfunc(a:type), "\s*;[^\n]*", '', 'g'), '\n\+\s*', ' ', 'g')) let input = s:input(substitute(substitute(s:opfunc(a:type), "\s*;[^\n]*", '', 'g'), '\n\+\s*', ' ', 'g'))
try if input !=# ''
if input !=# '' call foreplay#evalprint(input)
echo foreplay#eval(input) endif
endif
catch /^Clojure:/
return ''
endtry
endfunction endfunction
function! s:Eval(bang, line1, line2, count, args) abort function! s:Eval(bang, line1, line2, count, args) abort
@ -524,9 +525,9 @@ function! s:Eval(bang, line1, line2, count, args) abort
exe line1.','.line2.'delete _' exe line1.','.line2.'delete _'
endif endif
endif endif
try if a:bang
let result = foreplay#eval(expr) try
if a:bang let result = foreplay#eval(expr)
if a:args !=# '' if a:args !=# ''
call append(a:line1, result) call append(a:line1, result)
exe a:line1 exe a:line1
@ -534,11 +535,11 @@ function! s:Eval(bang, line1, line2, count, args) abort
call append(a:line1-1, result) call append(a:line1-1, result)
exe a:line1-1 exe a:line1-1
endif endif
else catch /^Clojure:/
echo result endtry
endif else
catch /^Clojure:/ call foreplay#evalprint(expr)
endtry endif
return '' return ''
endfunction endfunction
@ -584,14 +585,7 @@ function! s:inputeval() abort
if input ==# '' if input ==# ''
return '' return ''
else else
try call foreplay#evalprint(input)
echo foreplay#eval(input)
return ''
catch /^Clojure:/
return ''
catch
return 'echoerr '.string(v:exception)
endtry
endif endif
endfunction endfunction