[fix] Debugging nvim-cmp

config/nvim/lua/lsp.lua

@@ -0,0 +1,26 @@
+local lspconfig = require 'lspconfig'
+local lspstatus = require 'lsp-status'
+
+local cmp_nvim_lsp = require 'cmp_nvim_lsp'
+local capabilities = cmp_nvim_lsp.default_capabilities()
+require("mason-lspconfig").setup_handlers {
+    function(server_name) -- default handler (optional)
+        lspconfig[server_name].setup {
+            on_attach = lspstatus.on_attach,
+            capabilities = capabilities,
+        }
+    end,
+    ["rust_analyzer"] = function()
+        -- require 'lazy'.load('rust-tools');
+        vim.cmd([[autocmd BufEnter *.rs lua require("setup.rtools")]])
+    end,
+    ["clangd"] = function()
+        lspconfig.clangd.setup {
+            capabilities = capabilities,
+            cmd = { "clangd" },
+            filetypes = { "c", "cpp", "objc", "objcpp" },
+            root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
+            single_file_support = true,
+        }
+    end,
+}

config/nvim/lua/lsp/clangd.lua

@@ -1,12 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
--- local coq = require'coq'
-
-lspconfig.clangd.setup {
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-    capabilities = lspstatus.capabilities,
-    cmd = { "clangd" },
-    filetypes = { "c", "cpp", "objc", "objcpp" },
-    root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
-    single_file_support = true,
-}

config/nvim/lua/lsp/deno.lua

@@ -1,9 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
-local coq = require'coq'
-
-lspconfig.denols.setup{
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
-    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-}
-

config/nvim/lua/lsp/init.lua

@@ -1,41 +0,0 @@
--- local lspstatus = require('lsp-status')
--- lspstatus.register_progress()
-
-require 'lsp.lua-language-server'
-require 'lsp.clangd'
-
-require 'lspconfig'.tsserver.setup {}
--- require 'lspconfig'.pyright.setup {}
-require 'lspconfig'.sqlls.setup {}
--- require 'lspconfig'.jsonls.setup {
---     settings = {
---         json = {
---             schemas = require('schemastore').json.schemas(),
---             validate = { enable = true },
---         },
---     },
--- }
-
--- Set completeopt to have a better completion experience
--- vim.o.completeopt= "menuone,noinsert,noselect"
-vim.o.completeopt = "menuone,noselect"
-
--- vim.api.nvim_command [[autocmd CursorHold  <buffer> lua vim.lsp.buf.document_highlight()]]
--- vim.api.nvim_command [[autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()]]
--- vim.api.nvim_command [[autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()]]
---
-vim.api.nvim_buf_set_option(0, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
--- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-local lspconfig = require 'lspconfig'
-local lspstatus = require 'lsp-status'
--- local coq = require 'coq'
-
-require('mason-lspconfig').setup_handlers({
-    function(server_name)
-        lspconfig[server_name].setup({
-            on_attach = lspstatus.on_attach,
-            capabilities = lspstatus.capabilities,
-        })
-    end,
-})

config/nvim/lua/lsp/lua-language-server.lua

@@ -1,25 +0,0 @@
-local lspconfig = require 'lspconfig'
-local lspstatus = require('lsp-status')
--- local coq = require 'coq'
-
-lspconfig.lua_ls.setup {
-    cmd = { "lua-language-server" },
-    on_attach = function(client) lspstatus.on_attach(client) end,
-    capabilities = lspstatus.capabilities,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-    filetypes = { "lua" },
-    log_level = 2,
-    settings = {
-      Lua = {
-        diagnostics = {
-            globals = { 'vim' },
-        },
-        telemetry = {
-            enable = false,
-        },
-        formatting = {
-            end_of_line = 'lf',
-        },
-      }
-    }
-}

config/nvim/lua/lsp/pyls.lua

@@ -1,10 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require('lsp-status')
-local coq = require'coq'
-
-lspconfig.pyls.setup{
-    cmd = { "pyls" },
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
-    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-    filetypes = { "python" },
-}

config/nvim/lua/lsp/pyright.lua

@@ -1 +0,0 @@
-require'lspconfig'.pyright.setup{}

config/nvim/lua/lsp/rust-analyzer.lua

@@ -1,43 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
-local coq = require'coq'
-
-lspconfig.rust_analyzer.setup{
-    on_attach=function(client) lspstatus.on_attach(client) end,
-    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-    cmd = { "rust-analyzer" },
-    filetypes = { "rust" },
-    root_dir = lspconfig.util.root_pattern("Cargo.toml"),
-    settings = {
-        ["rust-analyzer"] = {
-            lruCapacity = 64,
-            assist = {
-                importGranularity = "module",
-                importPrefix = "by_crate",
-            },
-            procMacro = {
-                enable = true,
-            },
-            checkOnSave = {
-                command = "clippy",
-                allTargets = false,
-            },
-            cargo = {
-                loadOutDirsFromCheck = true,
-                -- allFeatures = true,
-            },
-            completion = {
-                autoimport = {
-                    enable = true,
-                }
-            },
-            diagnostics = {
-                disabled = {
-                    "unresolved-macro-call"
-                }
-            }
-
-        }
-    },
-}
-

config/nvim/lua/lsp/solang.lua

@@ -1,8 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
--- local coq = require'coq'
-
-lspconfig.solang.setup{
-    on_attach=function(client) lspstatus.on_attach(client) end,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-}

config/nvim/lua/lsp/tsserver.lua

@@ -1,8 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
--- local coq = require'coq'
-
-lspconfig.tsserver.setup{
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-}

config/nvim/lua/plugins.lua

@@ -53,8 +53,7 @@ return require('lazy').setup({
     {
         'github/copilot.vim',
         event = "LspAttach",
-        cmd =
-        "Copilot"
+        cmd = "Copilot",
     },
     -- 'ggandor/leap.nvim',
     {
@@ -147,7 +146,7 @@ return require('lazy').setup({
                     }
                 }
             })
-        end
+        end,
     },
     {
         "williamboman/mason-lspconfig.nvim",
@@ -156,7 +155,8 @@ return require('lazy').setup({
                 ensure_installed = { "lua_ls", "rust_analyzer", "pylsp" },
                 automatic_installation = true,
             })
-        end
+        end,
+        lazy = false,
     },
     {
         'NTBBloodbath/galaxyline.nvim',
@@ -239,11 +239,28 @@ return require('lazy').setup({
             require("lsp")
         end
     },
-    { 'hrsh7th/cmp-nvim-lsp', lazy = false },
-    { 'hrsh7th/cmp-buffer', lazy = false },
-    { 'hrsh7th/cmp-path', lazy = false },
-    { 'hrsh7th/cmp-cmdline', lazy = false },
-    { 'hrsh7th/nvim-cmp', lazy = false },
+    { 'hrsh7th/cmp-nvim-lsp',        lazy = false },
+    { 'hrsh7th/cmp-buffer',          lazy = false },
+    { 'hrsh7th/cmp-path',            lazy = false },
+    { 'hrsh7th/cmp-cmdline',         lazy = false },
+    {
+        'hrsh7th/nvim-cmp',
+        lazy = false,
+        setup = function()
+            local cmp = require("cmp")
+            -- print!"setting up cmp");
+            cmp.setup({
+                view = cmp.config.view({
+                    entries = { name = 'custom', selection_order = 'near_cursor' }
+                }),
+                sources = cmp.config.sources({
+                    { name = 'buffer' },
+                    { name = 'nvim_lsp' },
+                    { name = 'path' },
+                }),
+            })
+        end
+    },
     {
         'nvim-lua/lsp-status.nvim',
         event = "LspAttach"
@@ -356,9 +373,8 @@ return require('lazy').setup({
         'simrat39/rust-tools.nvim',
         ft = 'rust',
         config = function()
-            require 'setup.rust-tools'
+            require 'setup.rtools'
         end,
-        -- dependencies = "ms-jpq/coq_nvim"
     },
 
 
@@ -442,6 +458,6 @@ return require('lazy').setup({
 
 }, {
     defaults = {
-        lazy = true,
+        lazy = false,
     }
 });

config/nvim/lua/setup/rtools.lua

@@ -7,7 +7,6 @@ local liblldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lldb
 local rt = require('rust-tools')
 local lspstatus = require('lsp-status')
 -- local lsp_signature = require('lsp_signature')
--- local coq = require('coq')
 
 local opts = {
     tools = { -- rust-tools options
@@ -230,7 +229,8 @@ local opts = {
             -- lsp_signature.on_attach(client, bufnr)
             lspstatus.on_attach(client)
         end,
-        capabilities = lspstatus.capabilities,
+        -- capabilities = lspstatus.capabilities,
+        capabilities = require('cmp_nvim_lsp').default_capabilities(),
 
     }, -- rust-analyer options
     -- debugging stuff