mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14693 from shadmansaleh/enhance/lsp/make_focusable_parameter_configurable

Browse Source 
feat(lsp): Make focusability of lsp float configurable
This commit is contained in:
Michael Lingelbach
2021-06-01 04:32:59 -07:00
committed by GitHub
parent 64bdaef327 68d48e25b6
commit b10cda83fa
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/doc/lsp.txt
View File

@@ -1886,6 +1886,28 @@ open_floating_preview({contents}, {syntax}, {opts})
{contents} table of lines to show in window {contents} table of lines to show in window
{syntax} string of syntax to set for opened buffer {syntax} string of syntax to set for opened buffer
{opts} dictionary with optional fields {opts} dictionary with optional fields
• height of floating window
• width of floating window
• wrap boolean enable wrapping of long lines
(defaults to true)
• wrap_at character to wrap at for computing
height when wrap is enabled
• max_width maximal width of floating window
• max_height maximal height of floating window
• pad_left number of columns to pad contents
at left
• pad_right number of columns to pad contents
at right
• pad_top number of lines to pad contents at
top
• pad_bottom number of lines to pad contents
at bottom
• focus_id if a popup with this id is opened,
then focus it
• close_events list of events that closes the
floating window
• focusable (boolean, default true): Make
float focusable
Return: ~ Return: ~
bufnr,winnr buffer and window number of the newly created bufnr,winnr buffer and window number of the newly created

28
runtime/lua/vim/lsp/util.lua
View File

@@ -935,6 +935,7 @@ function M.make_floating_popup_options(width, height, opts)
anchor = anchor, anchor = anchor,
col = col + (opts.offset_x or 0), col = col + (opts.offset_x or 0),
height = height, height = height,
focusable = opts.focusable,
relative = 'cursor', relative = 'cursor',
row = row + (opts.offset_y or 0), row = row + (opts.offset_y or 0),
style = 'minimal', style = 'minimal',
@@ -1324,18 +1325,19 @@ end
--@param contents table of lines to show in window --@param contents table of lines to show in window
--@param syntax string of syntax to set for opened buffer --@param syntax string of syntax to set for opened buffer
--@param opts dictionary with optional fields --@param opts dictionary with optional fields
-- - height of floating window --- - height of floating window
-- - width of floating window --- - width of floating window
-- - wrap boolean enable wrapping of long lines (defaults to true) --- - wrap boolean enable wrapping of long lines (defaults to true)
-- - wrap_at character to wrap at for computing height when wrap is enabled --- - wrap_at character to wrap at for computing height when wrap is enabled
-- - max_width maximal width of floating window --- - max_width maximal width of floating window
-- - max_height maximal height of floating window --- - max_height maximal height of floating window
-- - pad_left number of columns to pad contents at left --- - pad_left number of columns to pad contents at left
-- - pad_right number of columns to pad contents at right --- - pad_right number of columns to pad contents at right
-- - pad_top number of lines to pad contents at top --- - pad_top number of lines to pad contents at top
-- - pad_bottom number of lines to pad contents at bottom --- - pad_bottom number of lines to pad contents at bottom
-- - focus_id if a popup with this id is opened, then focus it --- - focus_id if a popup with this id is opened, then focus it
-- - close_events list of events that closes the floating window --- - close_events list of events that closes the floating window
--- - focusable (boolean, default true): Make float focusable
--@returns bufnr,winnr buffer and window number of the newly created floating --@returns bufnr,winnr buffer and window number of the newly created floating
---preview window ---preview window
function M.open_floating_preview(contents, syntax, opts) function M.open_floating_preview(contents, syntax, opts)
@@ -1352,7 +1354,7 @@ function M.open_floating_preview(contents, syntax, opts)
local bufnr = api.nvim_get_current_buf() local bufnr = api.nvim_get_current_buf()
-- check if this popup is focusable and we need to focus -- check if this popup is focusable and we need to focus
if opts.focus_id then if opts.focus_id and opts.focusable ~= false then
-- Go back to previous window if we are in a focusable one -- Go back to previous window if we are in a focusable one
local current_winnr = api.nvim_get_current_win() local current_winnr = api.nvim_get_current_win()
if npcall(api.nvim_win_get_var, current_winnr, opts.focus_id) then if npcall(api.nvim_win_get_var, current_winnr, opts.focus_id) then