From 8000535b37caff16d4d12b62e58ae6bc2eb81ed8 Mon Sep 17 00:00:00 2001
From: Matthew Leong <mattleong91@gmail.com>
Date: Sat, 8 Jun 2024 22:58:22 -0700
Subject: [PATCH] feat: clean up provider defaults
---
lua/cosmic/lsp/providers/defaults.lua | 10 +++++++++-
lua/cosmic/utils/lsp.lua | 15 ---------------
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua
index fb6cbc8..0f9037f 100644
--- a/lua/cosmic/lsp/providers/defaults.lua
+++ b/lua/cosmic/lsp/providers/defaults.lua
@@ -34,7 +34,15 @@ function M.on_attach(client, bufnr)
})
vim.api.nvim_create_autocmd('BufWritePre', {
callback = function()
- lsp_utils.format_on_save(client, bufnr)
+ if not lsp_utils.format_on_save_disabled then
+ vim.lsp.buf.format({
+ timeout_ms = user_config.lsp.format_timeout,
+ bufnr = bufnr,
+ filter = function()
+ return lsp_utils.can_format_on_save(client)
+ end,
+ })
+ end
end,
buffer = bufnr,
group = M.augroup,
diff --git a/lua/cosmic/utils/lsp.lua b/lua/cosmic/utils/lsp.lua
index 424237e..71b99c3 100644
--- a/lua/cosmic/utils/lsp.lua
+++ b/lua/cosmic/utils/lsp.lua
@@ -40,21 +40,6 @@ function M.buf_format(bufnr, timeout)
})
end
--- format current buffer w/user settings
-function M.format_on_save(client, bufnr)
- if M.format_on_save_disabled then
- return
- end
-
- vim.lsp.buf.format({
- timeout_ms = user_config.lsp.format_timeout,
- bufnr = bufnr or vim.api.nvim_get_current_buf(),
- filter = function()
- return M.can_format_on_save(client)
- end,
- })
-end
-
function M.buf_get_active_client_names(bufnr)
local active_clients = vim.lsp.get_clients({
bufnr = bufnr or vim.api.nvim_get_current_buf(),