Switch back to COQ.nvim

config/nvim/init.lua

@@ -75,7 +75,21 @@ vim.g.test = {
 vim.o.completeopt = 'menuone,noselect'
 
 vim.g.coq_settings = {
-    auto_start = 'shut-up'
+    auto_start = 'shut-up',
+    weights = {
+        prefix_matches = 4
+    },
+    clients = {
+        lsp = {
+            weight_adjust = 1
+        },
+        buffers = {
+            weight_adjust = -0.5
+        },
+        snippets = {
+            weight_adjust = -0.1
+        }
+    }
 }
 vim.g.rooter_manual_only = 1
 

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

@@ -1,11 +1,11 @@
 local lspconfig = require 'lspconfig'
 local lspstatus = require('lsp-status')
--- local coq = require'coq'
+local coq = require 'coq'
 
 lspconfig.sumneko_lua.setup {
     cmd = { "lua-language-server" },
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
+    on_attach = function(client) lspstatus.on_attach(client) end,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
     filetypes = { "lua" },
     log_level = 2,
     settings = {
@@ -15,7 +15,10 @@ lspconfig.sumneko_lua.setup{
         },
         telemetry = {
             enable = false,
-        }
+        },
+        formatting = {
+            end_of_line = 'lf',
+        },
       }
     }
 }

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

@@ -1,10 +1,10 @@
 local lspconfig = require'lspconfig'
 local lspstatus = require'lsp-status'
--- local coq = require'coq'
+local coq = require'coq'
 
 lspconfig.rust_analyzer.setup{
     on_attach=function(client) lspstatus.on_attach(client) end,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
     cmd = { "rust-analyzer" },
     filetypes = { "rust" },
     root_dir = lspconfig.util.root_pattern("Cargo.toml"),

config/nvim/lua/plugins.lua

@@ -62,53 +62,54 @@ return require('packer').startup(function()
 
 
 
-    use { 'ray-x/cmp-treesitter' }
+    -- use { 'ray-x/cmp-treesitter' }
-    use { 'andersevenrud/cmp-tmux' }
+    -- use { 'andersevenrud/cmp-tmux' }
-    use { 'hrsh7th/cmp-vsnip' }
+    -- use { 'hrsh7th/cmp-vsnip' }
-    use { 'hrsh7th/vim-vsnip' }
+    -- use { 'hrsh7th/vim-vsnip' }
-    use { 'hrsh7th/cmp-nvim-lsp' }
+    -- use { 'hrsh7th/cmp-nvim-lsp' }
-    use { 'hrsh7th/cmp-buffer' }
+    -- use { 'hrsh7th/cmp-buffer' }
-    use { 'hrsh7th/cmp-path' }
+    -- use { 'hrsh7th/cmp-path' }
-    use { 'hrsh7th/cmp-cmdline' }
+    -- use { 'hrsh7th/cmp-cmdline' }
-    use { 'hrsh7th/nvim-cmp',
+    -- use { 'hrsh7th/nvim-cmp',
-        config = function() 
+    --       config = function()
-            local cmp = require("cmp")
+    --           local cmp = require("cmp")
-            cmp.setup({
+    --           cmp.setup({
-            snippet = {
+    --         snippet = {
-              -- REQUIRED - you must specify a snippet engine
+    --           -- REQUIRED - you must specify a snippet engine
-              expand = function(args)
+    --           expand = function(args)
-                vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+    --               vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-                -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+    --               -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-                -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+    --               -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
-                -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+    --               -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-              end,
+    --           end,
-            },
+    --         },
-            mapping = {
+    --         mapping = {
-              ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+    --           ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
-              ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+    --           ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
-              ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
+    --           ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
-              ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+    --           ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
-              ['<C-e>'] = cmp.mapping({
+    --           ['<C-e>'] = cmp.mapping({
-                i = cmp.mapping.abort(),
+    --             i = cmp.mapping.abort(),
-                c = cmp.mapping.close(),
+    --             c = cmp.mapping.close(),
-              }),
+    --           }),
-              ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    --           ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-            },
+    --         },
-            sources = cmp.config.sources({
+    --         sources = cmp.config.sources({
-              { name = 'nvim_lsp' },
+    --           { name = 'nvim_lsp' },
-              { name = 'vsnip' }, -- For vsnip users.
+    --           { name = 'vsnip' }, -- For vsnip users.
-            }, {
+    --         }, {
-              { name = 'buffer' },
+    --           { name = 'buffer' },
-              { name = 'tmux' },
+    --           { name = 'tmux' },
-              { name = 'treesitter' },
+    --           { name = 'treesitter' },
-              -- { name = 'snippy' }, -- For snippy users.
+    --           -- { name = 'snippy' }, -- For snippy users.
-            })
+    --         })
-        }) end,
+    --           })
-    }
+    --       end,
+    -- }
 
 
 
-    -- use { 'ms-jpq/coq_nvim', requires =  { 'ms-jpq/coq.artifacts' } }
+    use { 'ms-jpq/coq_nvim', requires = { 'ms-jpq/coq.artifacts' } }
 
     -- use { 'folke/lsp-colors.nvim',
     --     config = function() require("lsp-colors").setup({
@@ -149,4 +150,3 @@ return require('packer').startup(function()
     use 'ellisonleao/glow.nvim'
 
 end);
-