nvim: refactored completion support

Author: davidandreoletti

.config/cvim/init/init.vim

@@ -240,6 +240,7 @@ elseif g:vimDistribution ==# g:VIM_FLAVOR_NEOVIM
         \   'hrsh7th/cmp-buffer':{'lazy': 1},
         \   'hrsh7th/cmp-path':{'lazy': 1},
         \   'hrsh7th/cmp-cmdline':{'lazy': 1},
+        \   'hrsh7th/cmp-nvim-lsp-signature-help':{'lazy': 1},
         \   'rasulomaroff/cmp-bufname':{'lazy': 1},
         \   'amarakon/nvim-cmp-buffer-lines':{'lazy': 1},
         \   'hrsh7th/cmp-calc':{'lazy': 1},
@@ -269,6 +270,11 @@ elseif g:vimDistribution ==# g:VIM_FLAVOR_NEOVIM
         \ 'name': 'hrsh7th/cmp-cmdline',
         \ 'lazy': 1,
         \ }
+    " Auto completion source: function signature
+    let cvim_plugins.nvim_cmp_lsp_signature_help = {
+        \ 'name': 'hrsh7th/cmp-nvim-lsp-signature-help',
+        \ 'lazy': 1,
+        \ }
     " Auto completion source: vim's buffer name
     let cvim_plugins.nvim_cmp_bufname = {
         \ 'name': 'rasulomaroff/cmp-bufname',

.config/cvim/settings/nvim_nvim-cmp.lua

@@ -5,66 +5,75 @@ local function config()
     -- For a list of support completion plugins, 
     -- see https://github.com/hrsh7th/nvim-cmp/wiki/List-of-sources
     local cmp = require('cmp')
-    cmp.setup({
-        sources = {
-            { name = 'nvim_lsp', keyword_length = 1 },
-            { name = 'buffer'},
-            { name = 'path'},
-            { name = 'bufname'},
-            { name = 'buffer-lines', option = {
-                leading_whitespace = true
-            }},
-            { name = 'calc'},
-            { name = 'rpncalc'},
-            { name = 'dictionary', keyword_length = 2},
-            { name = 'omni', option = {
-                disable_omnifuncs = {'v:lua.vim.lsp.omnifunc'}
-            }},
-            { name = 'spell', option = {
-                keep_all_entries = false, 
-                enable_in_context = function()
-                    return true
-                end,
-                preselect_correc_word = true
-            }}
+    cmp.setup(
+        {
+            sources = {
+                { name = 'nvim_lsp', keyword_length = 1 },
+                { name = 'buffer'},
+                { name = 'path'},
+                { name = 'bufname'},
+                { name = 'buffer-lines', option = {
+                    leading_whitespace = true
+                }},
+                { name = 'nvim_lsp_signature_help'},
+                { name = 'calc'},
+                { name = 'rpncalc'},
+                { name = 'dictionary', keyword_length = 2},
+                { name = 'omni', option = {
+                    disable_omnifuncs = {'v:lua.vim.lsp.omnifunc'}
+                }},
+                { name = 'spell', option = {
+                    keep_all_entries = false, 
+                    enable_in_context = function()
+                        return true
+                    end,
+                    preselect_correc_word = true
+                }}
+            }
         }
-    })
-    -- setup completion for '/' search 
-    cmp.setup.cmdline('/', {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = {
-          -- cmp-cmdline offers completion based on current buffer
-          { name = 'buffer' }
-        } 
-    })
-    -- setup completion for command mode
-    cmp.setup.cmdline(':', {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = cmp.config.sources(
+    )
+    -- setup completion for '/' and '?' search 
+    cmp.setup.cmdline(
+        { '/', '?' },
         {
-          -- cmp-cmdline offers completion based on paths
-          { name = 'path' }
-        },
+            mapping = cmp.mapping.preset.cmdline(),
+            sources = cmp.config.sources(
+                {
+                    -- offers completion based on current buffer's words
+                    { 
+                        name = 'buffer',
+                        option = { keyword_pattern = [[\k\+]] } -- recognize words
+                    }
+                },
+                {
+                    -- offers completion based on current buffer's lines unless words source is available
+                    {   
+                        name = "buffer-lines" 
+                    }
+                }
+            ) 
+        }
+    )
+    -- setup completion for command mode
+    cmp.setup.cmdline(
+        {':'},
         {
-          {
-            name = 'cmdline',
-            option = {
-              ignore_cmds = { 'Man', '!' }
+            mapping = cmp.mapping.preset.cmdline(),
+            sources = {
+                    -- offers completion based on paths
+                    { 
+                        name = 'path'
+                    },
+                    -- offers completion based on cmdline
+                    {
+                        name = 'cmdline',
+                        option = {
+                            ignore_cmds = { 'Man', '!' }
+                        }
+                    }
             }
-          }
-        })
-    })
-    -- setup completion for / and ? in the command line
-    cmp.setup.cmdline({ "/", "?" }, {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = {
-            {
-                name = "buffer",
-                option = { keyword_pattern = [[\k\+]] }
-            },
-            { name = "buffer-lines" }
         }
-    })
+    )
     -- View cmp sources status with :CmpStatus
 end