diff options
| author | Michael Lingelbach <m.j.lbach@gmail.com> | 2021-05-21 11:17:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 11:17:17 -0700 |
| commit | efe33fc79927e6a3f70ab61afc5cb9dec6dc208d (patch) | |
| tree | c07f180a837d908fc264b5510f3a5382cc4de27c /runtime/lua/vim/lsp/handlers.lua | |
| parent | 75992f2ad9189a5f39b3e2ae7962c68d3af815a4 (diff) | |
| parent | bfdd750fce97e50029cf6503f791556ffeb2c08e (diff) | |
| download | rneovim-efe33fc79927e6a3f70ab61afc5cb9dec6dc208d.tar.gz rneovim-efe33fc79927e6a3f70ab61afc5cb9dec6dc208d.tar.bz2 rneovim-efe33fc79927e6a3f70ab61afc5cb9dec6dc208d.zip | |
Merge pull request #14604 from folke/master
feat(lsp): use same formatting for `signature_help` as `hover`
Diffstat (limited to 'runtime/lua/vim/lsp/handlers.lua')
| -rw-r--r-- | runtime/lua/vim/lsp/handlers.lua | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua index 525ec4ce5b..18155ceb7e 100644 --- a/runtime/lua/vim/lsp/handlers.lua +++ b/runtime/lua/vim/lsp/handlers.lua @@ -271,9 +271,7 @@ function M.hover(_, method, result, _, _, config) -- return { 'No information available' } return end - local bufnr, winnr = util.fancy_floating_markdown(markdown_lines, { - border = config.border - }) + local bufnr, winnr = util.fancy_floating_markdown(markdown_lines, config) util.close_preview_autocmd({"CursorMoved", "BufHidden", "InsertCharPre"}, winnr) return bufnr, winnr end) @@ -341,17 +339,20 @@ function M.signature_help(_, method, result, _, bufnr, config) print('No signature help available') return end - local lines = util.convert_signature_help_to_markdown_lines(result) - lines = util.trim_empty_lines(lines) - if vim.tbl_isempty(lines) then - print('No signature help available') - return - end - local syntax = api.nvim_buf_get_option(bufnr, 'syntax') - local p_bufnr, _ = util.focusable_preview(method, function() - return lines, util.try_trim_markdown_code_blocks(lines), config + local p_bufnr, winnr = util.focusable_float(method, function() + local ft = api.nvim_buf_get_option(bufnr, 'filetype') + local lines = util.convert_signature_help_to_markdown_lines(result, ft) + lines = util.trim_empty_lines(lines) + if vim.tbl_isempty(lines) then + print('No signature help available') + return + end + local p_bufnr, p_winnr = util.fancy_floating_markdown(lines, config) + util.close_preview_autocmd({"CursorMoved", "CursorMovedI", "BufHidden", "InsertCharPre"}, p_winnr) + + return p_bufnr, p_winnr end) - api.nvim_buf_set_option(p_bufnr, 'syntax', syntax) + return p_bufnr, winnr end --@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp |