From dec21bbab6cf9102e236806e20273d08f32f8716 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Sun, 31 Jul 2022 14:27:59 +0200
Subject: feat(lsp): bind formatexpr and omnifunc by default (#2865)

---
 lua/lvim/lsp/utils.lua | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'lua/lvim/lsp/utils.lua')

diff --git a/lua/lvim/lsp/utils.lua b/lua/lvim/lsp/utils.lua
index 2a23e501..fa1ac6d9 100644
--- a/lua/lvim/lsp/utils.lua
+++ b/lua/lvim/lsp/utils.lua
@@ -132,18 +132,20 @@ end
 ---filter passed to vim.lsp.buf.format
 ---always selects null-ls if it's available and caches the value per buffer
 ---@param client table client attached to a buffer
----@return table chosen clients
+---@return boolean if client matches
 function M.format_filter(client)
   local filetype = vim.bo.filetype
   local n = require "null-ls"
   local s = require "null-ls.sources"
   local method = n.methods.FORMATTING
-  local avalable_sources = s.get_available(filetype, method)
+  local avalable_formatters = s.get_available(filetype, method)
 
-  if #avalable_sources > 0 then
+  if #avalable_formatters > 0 then
     return client.name == "null-ls"
-  else
+  elseif client.supports_method "textDocument/formatting" then
     return true
+  else
+    return false
   end
 end
 
@@ -159,6 +161,7 @@ function M.format(opts)
 
   local bufnr = opts.bufnr or vim.api.nvim_get_current_buf()
 
+  ---@type table|nil
   local clients = vim.lsp.get_active_clients {
     id = opts.id,
     bufnr = bufnr,
-- 
cgit v1.2.3