From f3d42a4b7561f90d18b724183d35816adf12e986 Mon Sep 17 00:00:00 2001 From: flea Date: Mon, 19 Feb 2024 10:23:55 +0800 Subject: [PATCH] Fix: avoid rust-analyzer conflicts with rustaceanvim rustaceanvim setup rust-analyzer manually, do not need setup it at lspconfig --- init.lua | 2 ++ lazy-lock.json | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 0c9e4804..19c8f2e0 100644 --- a/init.lua +++ b/init.lua @@ -626,6 +626,8 @@ mason_lspconfig.setup_handlers { filetypes = (servers[server_name] or {}).filetypes, } end, + -- rustaceanvim setup rust-analyzer manually + ['rust_analyzer'] = function() end, } -- [[ Configure nvim-cmp ]] diff --git a/lazy-lock.json b/lazy-lock.json index 2257cf02..762c0794 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,10 +9,11 @@ "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, "indent-blankline.nvim": { "branch": "master", "commit": "258b5d899da7c681ce0e0225de32c593f3914c27" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lazygit.nvim": { "branch": "main", "commit": "1e08e3f5ac1152339690140e61a4a32b3bdc7de5" }, "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, + "mason-lspconfig": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "5b4db7c0d6873436b42bcda0ba7cd4efa9206745" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },