Support option variables

Author: hrsh7th

autoload/lsp/ui/vim.vim

@@ -509,14 +509,12 @@ function! s:handle_location(ctx, server, type, data) abort "ctx = {counter, list
             else
                 let l:lines = readfile(fnameescape(l:loc['filename']))
                 if has_key(l:loc,'viewstart') " showing a locationLink
-                    let l:view = l:lines[l:loc['viewstart'] : l:loc['viewend']]
-                    let l:screenpos = lsp#ui#vim#floatwin#screenpos(line('.'), col('.'))
-                    call s:floatwin.show(l:screenpos, lsp#utils#normalize_markup_content({
-                                \   'language': &filetype,
-                                \   'value': join(l:view, "\n")
-                                \ }))
-                else " showing a location
-                    let l:screenpos = lsp#ui#vim#floatwin#screenpos(line('.'), col('.'))
+                    let l:lines = l:lines[l:loc['viewstart'] : l:loc['viewend']]
+                endif
+                let l:screenpos = lsp#ui#vim#floatwin#screenpos(line('.'), col('.'))
+                if s:floatwin.is_showing()
+                    call s:floatwin.enter()
+                else
                     call s:floatwin.show(l:screenpos, lsp#utils#normalize_markup_content({
                                 \   'language': &filetype,
                                 \   'value': join(l:lines, "\n")

autoload/lsp/ui/vim/floatwin.vim

@@ -35,8 +35,8 @@ function! s:Floatwin.new(option) abort
   return extend(deepcopy(s:Floatwin), {
         \   'id': s:floatwin_id,
         \   'bufnr': l:bufnr,
-        \   'max_width': get(a:option, 'max_width', &columns / 3),
-        \   'max_height': get(a:option, 'max_height', &lines / 2),
+        \   'max_width': get(a:option, 'max_width', g:lsp_preview_max_width),
+        \   'max_height': get(a:option, 'max_height', g:lsp_preview_max_height),
         \   'close_on': get(a:option, 'close_on', []),
         \   'screenpos': [0, 0],
         \   'contents': []
@@ -88,7 +88,9 @@ function! s:Floatwin.show(screenpos, contents) abort
   " show or move
   call lsp#ui#vim#floatwin#{s:namespace}#show(self)
   call setwinvar(self.winid(), '&wrap', 1)
-  call setwinvar(self.winid(), '&conceallevel', 3)
+  if g:lsp_hover_conceal
+    call setwinvar(self.winid(), '&conceallevel', 3)
+  endif
 
   " write lines
   call lsp#ui#vim#floatwin#{s:namespace}#write(self, l:lines)
@@ -115,7 +117,9 @@ endfunction
 " enter
 "
 function! s:Floatwin.enter() abort
-  call lsp#ui#vim#floatwin#{s:namespace}#enter(self)
+  if g:lsp_preview_doubletap
+    call lsp#ui#vim#floatwin#{s:namespace}#enter(self)
+  endif
 endfunction
 
 "
@@ -139,12 +143,14 @@ function! s:Floatwin.set_close_events() abort
   let l:close_fn = printf('lsp_floatwin_close_%s', self.id)
   let b:[l:close_fn] = { -> self.hide() }
 
-  augroup printf('lsp#ui#vim#floatwin#hide_%s', self.id)
-    autocmd!
-    for l:event in self.close_on
-      execute printf('autocmd %s <buffer> call b:%s()', l:event, l:close_fn)
-    endfor
-  augroup END
+  if g:lsp_preview_autoclose
+    augroup printf('lsp#ui#vim#floatwin#hide_%s', self.id)
+      autocmd!
+      for l:event in self.close_on
+        execute printf('autocmd %s <buffer> call b:%s()', l:event, l:close_fn)
+      endfor
+    augroup END
+  endif
 endfunction
 
 "

autoload/lsp/ui/vim/hover.vim

@@ -40,8 +40,12 @@ function! s:handle_hover(server, data) abort
     endif
 
     if !empty(a:data['response']['result']) && !empty(a:data['response']['result']['contents'])
-        let l:screenpos = lsp#ui#vim#floatwin#screenpos(line('.'), col('.'))
-        call s:floatwin.show_tooltip(l:screenpos, lsp#utils#normalize_markup_content(a:data['response']['result']['contents']))
+        if s:floatwin.is_showing()
+            call s:floatwin.enter()
+        else
+            let l:screenpos = lsp#ui#vim#floatwin#screenpos(line('.'), col('.'))
+            call s:floatwin.show_tooltip(l:screenpos, lsp#utils#normalize_markup_content(a:data['response']['result']['contents']))
+        endif
         return
     else
         call lsp#utils#error('No hover information found')

autoload/lsp/ui/vim/signature_help.vim

@@ -82,10 +82,15 @@ function! s:handle_signature_help(server, data) abort
         let l:contents = lsp#utils#normalize_markup_content(l:contents)
         if mode()[0] == 'i'
             let s:floatwin.close_on = ['InsertLeave', 'CursorMovedI', 'CursorMovedP']
+            call s:floatwin.show_tooltip(l:screenpos, l:contents)
         else
             let s:floatwin.close_on = ['InsertEnter', 'CursorMoved']
+            if s:floatwin.is_showing()
+                call s:floatwin.enter()
+            else
+                call s:floatwin.show_tooltip(l:screenpos, l:contents)
+            endif
         endif
-        call s:floatwin.show(l:screenpos, l:contents)
         return
     else
         " signature help is used while inserting. So this must be graceful.