From bdad7dbab302bb6c4a747063cce6e9c6a687c62b Mon Sep 17 00:00:00 2001 From: kenobi Date: Mon, 12 May 2025 11:27:08 +0200 Subject: [PATCH] formatting, completion, lsp --- nvim/lua/plugins/blink.lua | 53 ++++++++++++ nvim/lua/plugins/conform.lua | 29 +++++++ nvim/lua/plugins/lsp.lua | 152 +++++++++++++-------------------- nvim/lua/plugins/rustacean.lua | 5 ++ 4 files changed, 148 insertions(+), 91 deletions(-) create mode 100644 nvim/lua/plugins/blink.lua create mode 100644 nvim/lua/plugins/conform.lua create mode 100644 nvim/lua/plugins/rustacean.lua diff --git a/nvim/lua/plugins/blink.lua b/nvim/lua/plugins/blink.lua new file mode 100644 index 0000000..7216cc7 --- /dev/null +++ b/nvim/lua/plugins/blink.lua @@ -0,0 +1,53 @@ +return { + 'saghen/blink.cmp', + -- optional: provides snippets for the snippet source + dependencies = { 'rafamadriz/friendly-snippets' }, + + -- use a release tag to download pre-built binaries + version = '1.*', + -- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust + -- build = 'cargo build --release', + -- If you use nix, you can build from source using latest nightly rust with: + -- build = 'nix run .#build-plugin', + + ---@module 'blink.cmp' + ---@type blink.cmp.Config + opts = { + -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept) + -- 'super-tab' for mappings similar to vscode (tab to accept) + -- 'enter' for enter to accept + -- 'none' for no mappings + -- + -- All presets have the following mappings: + -- C-space: Open menu or open docs if already open + -- C-n/C-p or Up/Down: Select next/previous item + -- C-e: Hide menu + -- C-k: Toggle signature help (if signature.enabled = true) + -- + -- See :h blink-cmp-config-keymap for defining your own keymap + keymap = { preset = 'super-tab' }, + + appearance = { + -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono' + }, + + -- (Default) Only show the documentation popup when manually triggered + completion = { documentation = { auto_show = false } }, + + -- Default list of enabled providers defined so that you can extend it + -- elsewhere in your config, without redefining it, due to `opts_extend` + sources = { + default = { 'lsp', 'path', 'snippets', 'buffer' }, + }, + + -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance + -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation, + -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"` + -- + -- See the fuzzy documentation for more information + fuzzy = { implementation = "prefer_rust_with_warning" } + }, + opts_extend = { "sources.default" } +} diff --git a/nvim/lua/plugins/conform.lua b/nvim/lua/plugins/conform.lua new file mode 100644 index 0000000..ad13a52 --- /dev/null +++ b/nvim/lua/plugins/conform.lua @@ -0,0 +1,29 @@ +return { + "stevearc/conform.nvim", + keys = { + { + "cf", + function() + require("conform").format({ lsp_format = "fallback" }) + end, + desc = "[C]ode [F]ormat", + }, + }, + opts = { + formatters_by_ft = { + lua = { "stylua" }, + -- Conform will run multiple formatters sequentially + python = { "isort", "black" }, + -- You can customize some of the format options for the filetype (:help conform.format) + rust = { "rustfmt" }, + -- Conform will run the first available formatter + javascript = { "prettierd", "prettier", stop_after_first = true }, + typescript = { "prettierd", "prettier", stop_after_first = true }, + format_on_save = { + -- These options will be passed to conform.format() + timeout_ms = 500, + lsp_format = "fallback", + }, + }, + }, +} diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 3c87c97..c37df8c 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -1,70 +1,54 @@ return { - -- Main LSP Configuration - 'neovim/nvim-lspconfig', + "neovim/nvim-lspconfig", dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - -- Mason must be loaded before its dependents so we need to set it up here. - -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})` - { 'williamboman/mason.nvim', opts = {} }, - 'williamboman/mason-lspconfig.nvim', - 'WhoIsSethDaniel/mason-tool-installer.nvim', + { "williamboman/mason.nvim", opts = {} }, + "williamboman/mason-lspconfig.nvim", + "WhoIsSethDaniel/mason-tool-installer.nvim", - -- Useful status updates for LSP. - { 'j-hui/fidget.nvim', opts = {} }, + { "j-hui/fidget.nvim", opts = {} }, - -- Allows extra capabilities provided by blink.cmp - 'saghen/blink.cmp', + "saghen/blink.cmp", }, config = function() - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + vim.api.nvim_create_autocmd("LspAttach", { + group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }), callback = function(event) - -- NOTE: Remember that Lua is a real programming language, and as such it is possible - -- to define small helper and utility functions so you don't have to repeat yourself. - -- - -- In this case, we create a function that lets us more easily define mappings specific - -- for LSP related items. It sets the mode, buffer and description for us each time. local map = function(keys, func, desc, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + mode = mode or "n" + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = "LSP: " .. desc }) end -- Rename the variable under your cursor. - -- Most Language Servers support renaming across files, etc. - map('rn', vim.lsp.buf.rename, '[R]e[n]ame') + map("cr", vim.lsp.buf.rename, "([C]ode) [R]ename") -- Execute a code action, usually your cursor needs to be on top of an error -- or a suggestion from your LSP for this to activate. - map('ca', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) + map("ca", require("fzf-lua").lsp_code_actions, "[G]oto Code [A]ction", { "n", "x" }) + map("cd", vim.diagnostic.open_float, "[C]ode [D]iagnostics in float") + map("gwd", require("fzf-lua").diagnostics_workspace, "[G]o [W]orkspace [D]iagnostics") -- Find references for the word under your cursor. - map('gr', require('fzf-lua').lsp_references, '[G]oto [R]eferences') + map("gr", require("fzf-lua").lsp_references, "[G]oto [R]eferences") -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. - map('gi', require('fzf-lua').lsp_implementations, '[G]oto [I]mplementation') + map("gi", require("fzf-lua").lsp_implementations, "[G]oto [I]mplementation") -- Jump to the definition of the word under your cursor. -- This is where a variable was first declared, or where a function is defined, etc. -- To jump back, press . - map('gd', require('fzf-lua').lsp_definitions, '[G]oto [D]efinition') + map("gd", require("fzf-lua").lsp_definitions, "[G]oto [D]efinition") -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration") -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - map('gO', require('fzf-lua').lsp_document_symbols, 'Open Document Symbols') + map("gO", require("fzf-lua").lsp_document_symbols, "Open Document Symbols") -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - map('gW', require('fzf-lua').lsp_live_workspace_symbols, 'Open Workspace Symbols') + map("gW", require("fzf-lua").lsp_live_workspace_symbols, "Open Workspace Symbols") -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. - map('gT', require('fzf-lua').lsp_typedefs, '[G]oto [T]ype Definition') + map("gT", require("fzf-lua").lsp_typedefs, "[G]oto [T]ype Definition") -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10) ---@param client vim.lsp.Client @@ -72,70 +56,63 @@ return { ---@param bufnr? integer some lsp support methods only in specific files ---@return boolean local function client_supports_method(client, method, bufnr) - if vim.fn.has 'nvim-0.11' == 1 then + if vim.fn.has("nvim-0.11") == 1 then return client:supports_method(method, bufnr) else return client.supports_method(method, { bufnr = bufnr }) end end - -- The following two autocommands are used to highlight references of the - -- word under your cursor when your cursor rests there for a little while. - -- See `:help CursorHold` for information about when this is executed - -- - -- When you move your cursor, the highlights will be cleared (the second autocommand). local client = vim.lsp.get_client_by_id(event.data.client_id) - if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { + if + client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) + then + local highlight_augroup = vim.api.nvim_create_augroup("kickstart-lsp-highlight", { clear = false }) + vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.document_highlight, }) - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { + vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.clear_references, }) - vim.api.nvim_create_autocmd('LspDetach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), + vim.api.nvim_create_autocmd("LspDetach", { + group = vim.api.nvim_create_augroup("kickstart-lsp-detach", { clear = true }), callback = function(event2) vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + vim.api.nvim_clear_autocmds({ group = "kickstart-lsp-highlight", buffer = event2.buf }) end, }) end - -- The following code creates a keymap to toggle inlay hints in your - -- code, if the language server you are using supports them - -- - -- This may be unwanted, since they displace some of your code if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then - map('th', function() - vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) - end, '[T]oggle Inlay [H]ints') + map("th", function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf })) + end, "[T]oggle Inlay [H]ints") end end, }) -- Diagnostic Config -- See :help vim.diagnostic.Opts - vim.diagnostic.config { + vim.diagnostic.config({ severity_sort = true, - float = { border = 'rounded', source = 'if_many' }, + float = { border = "rounded", source = "if_many" }, underline = { severity = vim.diagnostic.severity.ERROR }, - signs = vim.g.have_nerd_font and { + signs = { text = { - [vim.diagnostic.severity.ERROR] = '󰅚 ', - [vim.diagnostic.severity.WARN] = '󰀪 ', - [vim.diagnostic.severity.INFO] = '󰋽 ', - [vim.diagnostic.severity.HINT] = '󰌶 ', + [vim.diagnostic.severity.ERROR] = "󰅚 ", + [vim.diagnostic.severity.WARN] = "󰀪 ", + [vim.diagnostic.severity.INFO] = "󰋽 ", + [vim.diagnostic.severity.HINT] = "󰌶 ", }, } or {}, virtual_text = { - source = 'if_many', + source = "if_many", spacing = 2, format = function(diagnostic) local diagnostic_message = { @@ -147,13 +124,13 @@ return { return diagnostic_message[diagnostic.severity] end, }, - } + }) -- LSP servers and clients are able to communicate to each other what features they support. -- By default, Neovim doesn't support everything that is in the LSP specification. -- When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities. -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers. - local capabilities = require('blink.cmp').get_lsp_capabilities() + local capabilities = require("blink.cmp").get_lsp_capabilities() -- Enable the following language servers -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. @@ -168,7 +145,6 @@ return { -- clangd = {}, -- gopls = {}, -- pyright = {}, - -- rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- -- Some languages (like typescript) have entire language plugins that can be useful: @@ -177,10 +153,13 @@ return { -- But for many setups, the LSP (`ts_ls`) will work just fine -- ts_ls = {}, -- - vtsls={ - settings={} + + rust_analyzer = {}, + vtsls = { + settings = {}, }, + bashls = {}, lua_ls = { -- cmd = { ... }, -- filetypes = { ... }, @@ -188,7 +167,7 @@ return { settings = { Lua = { completion = { - callSnippet = 'Replace', + callSnippet = "Replace", }, -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings -- diagnostics = { disable = { 'missing-fields' } }, @@ -196,27 +175,18 @@ return { }, }, } - - -- Ensure the servers and tools above are installed - -- - -- To check the current status of installed tools and/or manually install - -- other tools, you can run - -- :Mason - -- - -- You can press `g?` for help in this menu. - -- - -- `mason` had to be setup earlier: to configure its options see the - -- `dependencies` table for `nvim-lspconfig` above. - -- - -- You can add other tools here that you want Mason to install - -- for you, so that they are available from within Neovim. local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code + "stylua", -- Used to format Lua code + "prettierd", + "codelldb", + "gitlab_ci_ls", + "js-debug-adapter", + "shfmt", }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } + require("mason-tool-installer").setup({ ensure_installed = ensure_installed }) - require('mason-lspconfig').setup { + require("mason-lspconfig").setup({ ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) automatic_installation = false, automatic_enable = true, @@ -226,10 +196,10 @@ return { -- This handles overriding only values explicitly passed -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for ts_ls) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) + server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {}) + require("lspconfig")[server_name].setup(server) end, }, - } + }) end, } diff --git a/nvim/lua/plugins/rustacean.lua b/nvim/lua/plugins/rustacean.lua new file mode 100644 index 0000000..eb83332 --- /dev/null +++ b/nvim/lua/plugins/rustacean.lua @@ -0,0 +1,5 @@ +return { + 'mrcjkb/rustaceanvim', + version = '^6', -- Recommended + lazy = false, -- This plugin is already lazy +}