diff options
Diffstat (limited to 'autoload/ale/floating_preview.vim')
| -rw-r--r-- | autoload/ale/floating_preview.vim | 48 |
1 files changed, 15 insertions, 33 deletions
diff --git a/autoload/ale/floating_preview.vim b/autoload/ale/floating_preview.vim index c2bf5b6b..d9172150 100644 --- a/autoload/ale/floating_preview.vim +++ b/autoload/ale/floating_preview.vim @@ -99,48 +99,30 @@ function! s:NvimPrepareWindowContent(lines) abort let l:width = max(map(copy(a:lines), 'strdisplaywidth(v:val)')) let l:height = min([len(a:lines), l:max_height]) - if empty(g:ale_floating_window_border) - return [a:lines, l:width, l:height] - endif - - " Add the size of borders - let l:width += 2 - let l:height += 2 - - let l:left = get(g:ale_floating_window_border, 0, '|') - let l:top = get(g:ale_floating_window_border, 1, '-') - let l:top_left = get(g:ale_floating_window_border, 2, '+') - let l:top_right = get(g:ale_floating_window_border, 3, '+') - let l:bottom_right = get(g:ale_floating_window_border, 4, '+') - let l:bottom_left = get(g:ale_floating_window_border, 5, '+') - let l:right = get(g:ale_floating_window_border, 6, l:left) - let l:bottom = get(g:ale_floating_window_border, 7, l:top) - - let l:lines = [l:top_left . repeat(l:top, l:width - 2) . l:top_right] - - for l:line in a:lines - let l:line_width = strchars(l:line) - let l:lines = add(l:lines, l:left . l:line . repeat(' ', l:width - l:line_width - 2). l:right) - endfor - - " Truncate the lines - if len(l:lines) > l:max_height + 1 - let l:lines = l:lines[0:l:max_height] - endif - - let l:lines = add(l:lines, l:bottom_left . repeat(l:bottom, l:width - 2) . l:bottom_right) - - return [l:lines, l:width, l:height] + return [a:lines[0:l:height-1], l:width, l:height] endfunction function! s:NvimCreate(options) abort + let l:left = get(g:ale_floating_window_border, 0, '|') + let l:top = get(g:ale_floating_window_border, 1, '-') + let l:popup_opts = extend({ \ 'relative': 'cursor', \ 'row': 1, \ 'col': 0, \ 'width': 42, \ 'height': 4, - \ 'style': 'minimal' + \ 'style': 'minimal', + \ 'border': empty(g:ale_floating_window_border) ? 'none' : [ + \ get(g:ale_floating_window_border, 2, '+'), + \ l:top, + \ get(g:ale_floating_window_border, 3, '+'), + \ get(g:ale_floating_window_border, 6, l:left), + \ get(g:ale_floating_window_border, 4, '+'), + \ get(g:ale_floating_window_border, 7, l:top), + \ get(g:ale_floating_window_border, 5, '+'), + \ l:left, + \ ], \ }, s:GetPopupOpts()) let l:buffer = nvim_create_buf(v:false, v:false) |