From 70f2ee8bbeaea03d490ec1d83002b421101c2550 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Tue, 2 Jul 2024 11:54:55 +0700 Subject: [PATCH] fix(nvim): Load LSP on LazyFile --- .config/nvim/lazy-lock.json | 35 ++--- .../null/plugins/{completion.lua => lsp.lua} | 121 ++++++++++++++++-- 2 files changed, 128 insertions(+), 28 deletions(-) rename .config/nvim/lua/null/plugins/{completion.lua => lsp.lua} (57%) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 640b572..2ff83e3 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,24 +1,27 @@ { "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" }, + "git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, - "nvim-lspconfig": { "branch": "master", "commit": "9266dc26862d8f3556c2ca77602e811472b4c5b8" }, - "nvim-treesitter": { "branch": "master", "commit": "3e10cffbb2a022cd8e2aaea9f4fffb514065e77c" }, - "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, - "oil.nvim": { "branch": "master", "commit": "e462a3446505185adf063566f5007771b69027a1" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, - "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, - "tree-sitter-gsp": { "branch": "master", "commit": "1f10ff9a6039a50e2f7be394fc22b1400832cf17" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, + "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, + "nvim-treesitter": { "branch": "master", "commit": "4ee5fdd666f46fb379302a32750f932d25448d98" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, + "tokyonight.nvim": { "branch": "main", "commit": "30d7be361a7fbf187a881f17e574e9213d5108ea" }, + "tree-sitter-gsp": { "branch": "master", "commit": "c549d8b3bbbade9ccb8c208295b35f5afbc7913b" }, "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" }, "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }, - "vim-wakatime": { "branch": "master", "commit": "5d11a253dd1ecabd4612a885175216032d814300" } + "vim-wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" } } \ No newline at end of file diff --git a/.config/nvim/lua/null/plugins/completion.lua b/.config/nvim/lua/null/plugins/lsp.lua similarity index 57% rename from .config/nvim/lua/null/plugins/completion.lua rename to .config/nvim/lua/null/plugins/lsp.lua index 934f24c..10c1f81 100644 --- a/.config/nvim/lua/null/plugins/completion.lua +++ b/.config/nvim/lua/null/plugins/lsp.lua @@ -1,12 +1,81 @@ +require("null.util").lazy_file() + return { + { + "williamboman/mason.nvim", + lazy = true, + config = function(_, opts) + require("mason").setup() + end, + }, + { + "williamboman/mason-lspconfig.nvim", + lazy = true, + dependencies = { + "williamboman/mason.nvim", + }, + opts = { + ensure_installed = { + "pyright", + -- "ruff", + -- "ruff_lsp", + }, + automatic_installation = { exclude = { "rust_analyzer" } }, + }, + config = function(_, opts) + require("mason-lspconfig").setup(opts) + end, + }, { "neovim/nvim-lspconfig", lazy = true, - config = function () + dependencies = { + "williamboman/mason-lspconfig.nvim", + }, + opts = function() + return { + diagnostics = { + underline = true, + update_in_insert = false, + virtual_text = { + spacing = 4, + source = "if_many", + prefix = "•", + }, + severity_sort = true, + signs = { + text = { + [vim.diagnostic.severity.ERROR] = " ", + [vim.diagnostic.severity.WARN] = " ", + [vim.diagnostic.severity.HINT] = " ", + [vim.diagnostic.severity.INFO] = " ", + }, + }, + }, + } + end, + config = function(_, opts) + vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) + + -- Setup lspconfig + local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") + local capabilities = vim.tbl_deep_extend( + "force", + {}, + vim.lsp.protocol.make_client_capabilities(), + has_cmp and cmp_nvim_lsp.default_capabilities() or {}, + opts.capabilities or {} + ) local lsp = require("lspconfig") - lsp.pyright.setup{} - -- lsp.jedi_language_server.setup{} + -- FIXME: Re enable once ruff is able to type check + -- lsp.ruff_lsp.setup({ + -- capabilities = capabilities, + -- }) + lsp.pyright.setup({ + capabilities = capabilities, + }) lsp.rust_analyzer.setup({ + capabilities = capabilities, settings = { ["rust-analyzer"] = { assist = { @@ -20,20 +89,53 @@ return { enable = true }, } - } + }, + }) + end, + }, + { + "mfussenegger/nvim-lint", + event = { "LazyFile" }, + dependencies = { + "williamboman/mason.nvim", + }, + opts = function() + return { + ignored = { }, + } + end, + config = function(_, opts) + require("lint").linters_by_ft = { + bash = { + "shellcheck", + }, + cmake = { + "cmakelint", + }, + } + vim.api.nvim_create_autocmd({ "BufWritePost", "BufReadPost", "InsertLeave", "TextChanged" }, { + callback = function(E) + if E.event == "TextChanged" then + return + end + require("lint").try_lint() + -- FIXME: If filename in opts.ignored: + -- vim.diagnostic.disable() + end, }) end, }, { "hrsh7th/nvim-cmp", - event = { "InsertEnter", "CmdlineEnter" }, + event = { "LazyFile" }, dependencies = { + "neovim/nvim-lspconfig", "hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-buffer", "hrsh7th/cmp-path", "hrsh7th/cmp-cmdline", }, - config = function () + config = function(_, opts) -- From vimrc, may need clean up local cmp = require("cmp") @@ -43,6 +145,7 @@ return { end cmp.setup({ + auto_brackets = { "python" }, snippet = { -- REQUIRED - you must specify a snippet engine expand = function(args) @@ -120,12 +223,6 @@ return { { name = "cmdline" } }) }) - - -- Setup lspconfig. - local capabilities = require("cmp_nvim_lsp").default_capabilities() - require("lspconfig")["pyright"].setup { - capabilities = capabilities - } end, }, }