updated rust support

2023-03-07 11:48:56 +00:00
parent 8f13de0ae3
commit 0d29ba524a
7 changed files with 134 additions and 102 deletions
--- a/common/.config/nvim/lua/keymappings.lua
+++ b/common/.config/nvim/lua/keymappings.lua
@@ -39,14 +39,3 @@ vim.api.nvim_set_keymap('', '<C-w><S-Right>', '<C-w><S-l>', opts)
 vim.api.nvim_set_keymap('', '<C-K>', '<C-O>', opts)
 vim.api.nvim_set_keymap('', '<C-L>', '<C-I>', opts)

-- LSP
-vim.api.nvim_set_keymap('n', '<Leader>gD', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<Leader>gT', '<Cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<Leader>gI', '<Cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<Leader>gR', '<Cmd>lua vim.lsp.buf.references()<CR>', opts)
-- Glance LSP
-vim.api.nvim_set_keymap('n', '<Leader>gd', '<CMD>Glance definitions<CR>', opts)
-vim.api.nvim_set_keymap('n', '<Leader>gt', '<CMD>Glance type_definitions<CR>', opts)
-vim.api.nvim_set_keymap('n', '<Leader>gi', '<CMD>Glance implementations<CR>', opts)
-vim.api.nvim_set_keymap('n', '<Leader>gr', '<CMD>Glance references<CR>', opts)
-
--- a/common/.config/nvim/lua/lsp-general.lua
+++ b/common/.config/nvim/lua/lsp-general.lua
@@ -5,12 +5,39 @@ require('mason-lspconfig').setup({
  ensure_installed = {'clangd'}
 })

+local opts = { noremap = true, silent = true, buffer = bufnr }
+vim.keymap.set('n', '<Leader>gD', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
+vim.keymap.set('n', '<Leader>gT', '<Cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+vim.keymap.set('n', '<Leader>gI', '<Cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+vim.keymap.set('n', '<Leader>gR', '<Cmd>lua vim.lsp.buf.references()<CR>', opts)
+-- Glance LSP
+vim.keymap.set('n', '<Leader>gd', '<CMD>Glance definitions<CR>', opts)
+vim.keymap.set('n', '<Leader>gt', '<CMD>Glance type_definitions<CR>', opts)
+vim.keymap.set('n', '<Leader>gi', '<CMD>Glance implementations<CR>', opts)
+vim.keymap.set('n', '<Leader>gr', '<CMD>Glance references<CR>', opts)
+
+local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
+
+local on_attatch = function(_, bufnr)
+    vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+end
+
 require('mason-lspconfig').setup_handlers({
-  function(server)
-    lspconfig[server].setup({})
-  end,
+    function(server)
+        lspconfig[server].setup({
+            on_attatch = on_attatch,
+            capabilities = capabilities,
+        })
+    end,
 })

+require('rust-tools').setup {
+    server = {
+        on_attatch = on_attach,
+        capabilities = capabilities,
+    }
+}
+
 -- diagnostic symbols
 local signs = { Error = "", Warn = "", Hint = "", Info =  ""}
 for type, icon in pairs(signs) do
@@ -46,3 +73,5 @@ vim.lsp.protocol.CompletionItemKind = {
    "   (Operator)",
    "   (TypeParameter)"
 }
+
+vim.api.nvim_create_autocmd("BufWritePre", { command = "lua vim.lsp.buf.format()" });
--- a/common/.config/nvim/lua/plugin-config/ministarter.lua
+++ b/common/.config/nvim/lua/plugin-config/ministarter.lua
@@ -1,30 +1,31 @@
 local status, starter = pcall(require, "mini.starter")
 if not status then
-	return
+    return
 end

 starter.setup({
-	content_hooks = {
-		starter.gen_hook.adding_bullet(""),
-		starter.gen_hook.aligning("center", "center"),
-	},
-	evaluate_single = true,
-	footer = os.date(),
-	header = table.concat({
+    content_hooks = {
+        starter.gen_hook.adding_bullet(""),
+        starter.gen_hook.aligning("center", "center"),
+    },
+    evaluate_single = true,
+    footer = os.date(),
+    header = table.concat({
        [[██████╗ ███████╗███╗   ██╗██╗   ██╗██╗███╗   ███╗]],
        [[██╔══██╗██╔════╝████╗  ██║██║   ██║██║████╗ ████║]],
        [[██████╔╝█████╗  ██╔██╗ ██║██║   ██║██║██╔████╔██║]],
        [[██╔══██╗██╔══╝  ██║╚██╗██║╚██╗ ██╔╝██║██║╚██╔╝██║]],
        [[██████╔╝███████╗██║ ╚████║ ╚████╔╝ ██║██║ ╚═╝ ██║]],
        [[╚═════╝ ╚══════╝╚═╝  ╚═══╝  ╚═══╝  ╚═╝╚═╝     ╚═╝]],
-		[[─────────────────────────────────────────────────]],
-	}, "\n"),
-	query_updaters = [[abcdefghilmoqrstuvwxyz0123456789_-,.ABCDEFGHIJKLMOQRSTUVWXYZ]],
-	items = {
-		{ action = "PackerSync", name = "U: Update Plugins", section = "Plugins" },
-		{ action = "enew", name = "E: New Buffer", section = "Builtin actions" },
-		{ action = "qall!", name = "Q: Quit Neovim", section = "Builtin actions" },
-	},
+        [[─────────────────────────────────────────────────]],
+    }, "\n"),
+    query_updaters = [[abcdefghilmoqrstuvwxyz0123456789_-,.ABCDEFGHIJKLMOQRSTUVWXYZ]],
+    items = {
+        { action = "PackerSync",    name = "U: Update Plugins",   section = "Plugins" },
+        { action = "PackerCompile", name = "R: Recompile Packer", section = "Plugins" },
+        { action = "enew",          name = "E: New Buffer",       section = "Builtin actions" },
+        { action = "qall!",         name = "Q: Quit Neovim",      section = "Builtin actions" },
+    },
 })

 vim.cmd([[
--- a/common/.config/nvim/lua/plugin-config/nvim-cmp.lua
+++ b/common/.config/nvim/lua/plugin-config/nvim-cmp.lua
@@ -1,36 +1,37 @@
-local cmp = require'cmp'
+local cmp = require 'cmp'

 cmp.setup({
-   snippet = {
-      expand = function(args)
-         vim.fn["vsnip#anonymous"](args.body)
-      end,
-   },
-   mapping = {
-      ["<C-p>"] = cmp.mapping.select_prev_item(),
-      ["<C-n>"] = cmp.mapping.select_next_item(),
-      ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-      ["<C-f>"] = cmp.mapping.scroll_docs(4),
-      ["<C-Space>"] = cmp.mapping.complete(),
-      ["<C-e>"] = cmp.mapping.close(),
-      ["<CR>"] = cmp.mapping.confirm({
-         behavior = cmp.ConfirmBehavior.Replace,
-         select = true,
-      }),
-      ["<Tab>"] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "s" }),
-      ["<S-Tab>"] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "s" }),
-   },
-   sources = {
-      { name = "nvim_lsp" },
-      { name = "vsnip" },
-      { name = "path" },
-   },
+    snippet = {
+        expand = function(args)
+            vim.fn["vsnip#anonymous"](args.body)
+        end,
+    },
+    mapping = {
+            ["<C-p>"] = cmp.mapping.select_prev_item(),
+            ["<C-n>"] = cmp.mapping.select_next_item(),
+            ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+            ["<C-f>"] = cmp.mapping.scroll_docs(4),
+            ["<C-Space>"] = cmp.mapping.complete(),
+            ["<C-e>"] = cmp.mapping.close(),
+            ["<CR>"] = cmp.mapping.confirm({
+            behavior = cmp.ConfirmBehavior.Replace,
+            select = true,
+        }),
+            ["<Tab>"] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "s" }),
+            ["<S-Tab>"] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "s" }),
+    },
+    sources = {
+        { name = "nvim_lsp" },
+        { name = "vsnip" },
+        { name = "path" },
+        { name = "buffer" },
+    },
 })

 -- Set configuration for specific filetype.
 cmp.setup.filetype('gitcommit', {
    sources = cmp.config.sources({
-        { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it. 
+        { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
    }, {
        { name = 'buffer' },
    })
@@ -51,4 +52,3 @@ cmp.setup.cmdline(':', {
        { name = 'cmdline' }
    })
 })
-
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -179,7 +179,11 @@ local packer = require('packer').startup(function(use)
        requires = {
            "williamboman/mason-lspconfig.nvim",
            "neovim/nvim-lspconfig",
+            'simrat39/rust-tools.nvim',
        },
+        config = function ()
+            require('lsp-general')
+        end
    }

    -- for LSP autocompletion