summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lua/lsp/init.lua8
-rw-r--r--lua/utils/init.lua10
2 files changed, 3 insertions, 15 deletions
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index d7109ac3..1488aec0 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -29,13 +29,11 @@ local function lsp_highlight_document(client)
end
local function formatter_handler(client)
- local formatter_exe = lvim.lang[vim.bo.filetype].formatters[1].exe
- if formatter_exe and formatter_exe ~= "" then
+ local formatters = lvim.lang[vim.bo.filetype].formatters
+ if not vim.tbl_isempty(formatters) then
client.resolved_capabilities.document_formatting = false
- -- NOTE: do we still need __FORMATTER_OVERRIDE?
- -- __FORMATTER_OVERRIDE = true
u.lvim_log(
- string.format("Overriding [%s] formatting if exists, Using provider [%s] instead", client.name, formatter_exe)
+ string.format("Overriding [%s] formatting if exists, Using provider [%s] instead", client.name, formatters[1].exe)
)
end
end
diff --git a/lua/utils/init.lua b/lua/utils/init.lua
index a41bfc10..b4c5fca1 100644
--- a/lua/utils/init.lua
+++ b/lua/utils/init.lua
@@ -110,16 +110,6 @@ function utils.is_string(t)
return type(t) == "string"
end
-function utils.has_value(tab, val)
- for _, value in ipairs(tab) do
- if value == val then
- return true
- end
- end
-
- return false
-end
-
function utils.add_keymap(mode, opts, keymaps)
for _, keymap in ipairs(keymaps) do
vim.api.nvim_set_keymap(mode, keymap[1], keymap[2], opts)