Merge branch 'nvim-lua:master' into master

Author: CalinLeafshade

README.md

@@ -75,6 +75,7 @@ another completion source instead(Ex: snippets).
     * [completion-tabnine](https://github.com/aca/completion-tabnine): AI code completion tool TabNine integration.
     * [completion-tags](https://github.com/kristijanhusak/completion-tags): Slightly improved ctags completion
     * [completion-tmux](https://github.com/albertoCaroM/completion-tmux): tmux panels completion
+    * [completion-vcard](https://github.com/cbarrete/completion-vcard): email completion from vCards
 
 ## Configuration
 

lua/completion/signature_help.lua

@@ -42,11 +42,12 @@ M.autoOpenSignatureHelp = function()
       if vim.tbl_isempty(lines) then
         return
       end
-      local bufnr, _ = vim.lsp.util.focusable_preview(method, function()
+      local bufnr, _ = vim.lsp.util.open_floating_preview(
         -- TODO show popup when signatures is empty?
-        lines = vim.lsp.util.trim_empty_lines(lines)
-        return lines, vim.lsp.util.try_trim_markdown_code_blocks(lines)
-      end)
+        vim.lsp.util.trim_empty_lines(lines),
+        vim.lsp.util.try_trim_markdown_code_blocks(lines),
+        {focus_id = method}
+      )
       -- setup a variable for floating window, fix #223
       vim.api.nvim_buf_set_var(bufnr, "lsp_floating", true)
     end)

lua/completion/source.lua

@@ -142,8 +142,7 @@ function M.triggerCompletion(force)
   local bufnr, line_to_cursor, cursor_to_end = getPositionParam()
   local textMatch = vim.fn.match(line_to_cursor, '\\k*$')
   local prefix = line_to_cursor:sub(textMatch+1)
-  local rev_textMatch = #cursor_to_end - vim.fn.match(cursor_to_end:reverse(), '\\k*$')
-  local suffix = cursor_to_end:sub(1, rev_textMatch)
+  local suffix = cursor_to_end:sub(1, vim.fn.matchend(cursor_to_end, '^\\k*'))
   manager.insertChar = true
   -- force is used when manually trigger, so it doesn't repect the trigger word length
   triggerCurrentCompletion(bufnr, line_to_cursor, prefix, textMatch, suffix, force)
@@ -154,8 +153,7 @@ function M.autoCompletion()
   local bufnr, line_to_cursor, cursor_to_end = getPositionParam()
   local textMatch = vim.fn.match(line_to_cursor, '\\k*$')
   local prefix = line_to_cursor:sub(textMatch+1)
-  local rev_textMatch = #cursor_to_end - vim.fn.match(cursor_to_end:reverse(), '\\k*$')
-  local suffix = cursor_to_end:sub(1, rev_textMatch)
+  local suffix = cursor_to_end:sub(1, vim.fn.matchend(cursor_to_end, '^\\k*'))
   local length = opt.get_option('trigger_keyword_length')
 
   -- reset completion when deleting character in insert mode

lua/completion/source/lsp.lua

@@ -30,15 +30,17 @@ local function get_completion_word(item, prefix, suffix)
       else
           newText = item.textEdit.newText
       end
-    if protocol.InsertTextFormat[item.insertTextFormat] == "PlainText"
-		or opt.get_option('enable_snippet') == "snippets.nvim" then
+    if not item.insertTextFormat
+    or protocol.InsertTextFormat[item.insertTextFormat] == "PlainText"
+    or opt.get_option('enable_snippet') == "snippets.nvim" then
       return newText
     else
       return vim.lsp.util.parse_snippet(newText)
     end
   elseif item.insertText ~= nil and item.insertText ~= vim.NIL then
-    if protocol.InsertTextFormat[item.insertTextFormat] == "PlainText"
-		or opt.get_option('enable_snippet') == "snippets.nvim" then
+    if not item.insertTextFormat
+    or protocol.InsertTextFormat[item.insertTextFormat] == "PlainText"
+    or opt.get_option('enable_snippet') == "snippets.nvim" then
       return item.insertText
     else
       return vim.lsp.util.parse_snippet(item.insertText)

lua/completion/util.lua

@@ -16,19 +16,29 @@ end
 --  completion items  --
 ------------------------
 
-function M.sort_completion_items(items)
-  table.sort(items, function(a, b)
-    if a.priority ~= b.priority and a.priority ~= nil and b.priority ~= nil then
-      return a.priority > b.priority
-    elseif a.score ~= b.score and a.score ~= nil and b.score ~= nil then
-      return a.score < b.score
-    elseif opt.get_option("sorting") == 'alphabet' then
+local function compare_strings(a, b)
+    if opt.get_option("sorting") == 'alphabet' then
       return a.word < b.word
     elseif opt.get_option("sorting") == 'length_desc' then
       return string.len(a.word) > string.len(b.word)
     else
       return string.len(a.word) < string.len(b.word)
     end
+end
+
+local function compare_scores_then_strings(a, b)
+  if a.score == b.score or a.score == nil or b.score == nil then
+    return compare_strings(a, b);
+  end
+  return a.score < b.score
+end
+
+function M.sort_completion_items(items)
+  table.sort(items, function(a, b)
+    if a.priority == b.priority or a.priority == nil or b.priority == nil then
+      return compare_scores_then_strings(a, b)
+    end
+    return a.priority > b.priority
   end)
 end