Browse Source

cleanup formatting handler (#1185)

kylo252 4 years ago
parent
commit
d977e7384e
2 changed files with 3 additions and 15 deletions
  1. 3 5
      lua/lsp/init.lua
  2. 0 10
      lua/utils/init.lua

+ 3 - 5
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

+ 0 - 10
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)