From 47525f5f8efb51f47d8ab44ede4244b71eb5e4ff Mon Sep 17 00:00:00 2001 From: James Stevenson Date: Sun, 6 Oct 2024 10:51:08 -0400 Subject: [PATCH] Fix name conflict --- nvim/lua/plugins/lsp/{conform.lua => format.lua} | 0 nvim/lua/plugins/lspzero.lua | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename nvim/lua/plugins/lsp/{conform.lua => format.lua} (100%) diff --git a/nvim/lua/plugins/lsp/conform.lua b/nvim/lua/plugins/lsp/format.lua similarity index 100% rename from nvim/lua/plugins/lsp/conform.lua rename to nvim/lua/plugins/lsp/format.lua diff --git a/nvim/lua/plugins/lspzero.lua b/nvim/lua/plugins/lspzero.lua index bf8b4d2..676ba5c 100644 --- a/nvim/lua/plugins/lspzero.lua +++ b/nvim/lua/plugins/lspzero.lua @@ -46,7 +46,7 @@ function Plugin.config() -- setup MUST go mason -> conform -> mason-conform require("plugins.lsp.mason") - require("plugins.lsp.conform") + require("plugins.lsp.format") vim.keymap.set("n", "f", function() require("conform").format({ async = true, lsp_fallback = true })