bugfix: Redundant blank lines in menu #359

Author: ray-x

README.md

@@ -2,8 +2,8 @@
 
 Show function signature when you type
 
-- This nvim plugin is made for completion plugins that do not support signature help. Need neovim-0.8+ and enable
-  nvim-lsp. (check neovim-0.5/neovim-0.6/neovim-0.9 branch for earlier version support)
+- This nvim plugin is made for completion plugins that do not support signature help. Need neovim-0.10+. (check
+  neovim-0.5/neovim-0.6/neovim-0.9 branch for earlier version support)
 
 - Inspired by [completion-nvim](https://github.com/nvim-lua/completion-nvim), which does have lots of cool features.
 
@@ -94,7 +94,6 @@ local golang_setup = {
 require'lspconfig'.gopls.setup(golang_setup)
 ```
 
-
 If you using Lazy.nvim, you can pass the config in the `opts` table:
 
 ```lua
@@ -153,7 +152,8 @@ No default keymaps are provided. Following are keymaps available in config:
 
 1. toggle_key: Toggle the signature help window. It manual toggle config.floating_windows on/off
 2. select_signature_key: Select the current signature when multiple signature is available.
-3. move floating window: move_cursor_key, array of two keymaps, if set, you can use these keymaps to move floating window up and down, default is nil
+3. move floating window: move_cursor_key, array of two keymaps, if set, you can use these keymaps to move floating
+   window up and down, default is nil
 
 #### Customize the keymap in your config:
 
@@ -187,7 +187,7 @@ e.g.
                  -- This setting only take effect in insert mode, it does not affect signature help in normal
                  -- mode, 10 by default
 
-  max_height = 12, -- max height of signature floating_window
+  max_height = 12, -- max height of signature floating_window, include borders
   max_width = function()
     return vim.api.nvim_win_get_width(0) * 0.8
   end, -- max_width of signature floating_window, line will be wrapped if exceed max_width

lua/lsp_signature/helper.lua

@@ -525,11 +525,16 @@ end
 
 -- note: this is a neovim internal function from lsp/util.lua
 
+---@private
+--- Computes size of float needed to show contents (with optional wrapping)
+---
 ---@param contents string[] of lines to show in window
 ---@param opts? vim.lsp.util.open_floating_preview.Opts
 ---@return integer width size of float
 ---@return integer height size of float
 local function make_floating_popup_size(contents, opts)
+  validate('contents', contents, 'table')
+  validate('opts', opts, 'table', true)
   opts = opts or {}
 
   local width = opts.width
@@ -614,14 +619,14 @@ helper.cal_pos = function(contents, opts)
   --    and return language_id
   -- 2. in other cases, no lines will be removed, and return "markdown"
   local filetype = helper.try_trim_markdown_code_blocks(contents)
-  log(vim.inspect(contents), opts)
 
   local width, height = make_floating_popup_size(contents, opts)
+  log('popup size:', width, height, opts)
   -- if the filetype returned is "markdown", and contents contains code fences, the height should minus 2, note,
   -- for latests nvim with conceal level 2 there is no need to `-2`
   -- because the code fences won't be display
   local code_block_flag = contents[1]:match('^```')
-  if filetype == 'markdown' and code_block_flag ~= nil and vim.fn.has('nvim-0.11') == 0 then
+  if filetype == 'markdown' and code_block_flag ~= nil then
     height = height - 2
   end
   local float_option = util.make_floating_popup_options(width, height, opts)