Remove some now redundant echo code

This commit is contained in:
w0rp 2017-12-18 11:22:24 +00:00
parent 8afd9a70a6
commit e0c3cbd16f

View File

@ -4,37 +4,23 @@
let s:cursor_timer = -1 let s:cursor_timer = -1
let s:last_pos = [0, 0, 0] let s:last_pos = [0, 0, 0]
function! s:EchoWithShortMess(setting, message) abort function! ale#cursor#TruncatedEcho(original_message) abort
" We need to remember the setting for shormess and reset it again. let l:message = a:original_message
let l:shortmess_options = getbufvar('%', '&shortmess')
try
" Turn shortmess on or off.
if a:setting is# 'on'
setlocal shortmess+=T
" echomsg is needed for the message to get truncated and appear in
" the message history.
exec "norm! :echomsg a:message\n"
elseif a:setting is# 'off'
setlocal shortmess-=T
" Regular echo is needed for printing newline characters.
execute 'echo a:message'
else
throw 'Invalid setting: ' . string(a:setting)
endif
finally
call setbufvar('%', '&shortmess', l:shortmess_options)
endtry
endfunction
function! ale#cursor#TruncatedEcho(message) abort
let l:message = a:message
" Change tabs to spaces. " Change tabs to spaces.
let l:message = substitute(l:message, "\t", ' ', 'g') let l:message = substitute(l:message, "\t", ' ', 'g')
" Remove any newlines in the message. " Remove any newlines in the message.
let l:message = substitute(l:message, "\n", '', 'g') let l:message = substitute(l:message, "\n", '', 'g')
call s:EchoWithShortMess('on', l:message) " We need to remember the setting for shortmess and reset it again.
let l:shortmess_options = &l:shortmess
try
" The message is truncated and saved to the history.
setlocal shortmess+=T
exec "norm! :echomsg l:message\n"
finally
let &l:shortmess = l:shortmess_options
endtry
endfunction endfunction
function! s:FindItemAtCursor() abort function! s:FindItemAtCursor() abort