From 2bcc3069d696475929b858b1da5f033c6d85365b Mon Sep 17 00:00:00 2001
From: Matthew Leong <mattleong91@gmail.com>
Date: Mon, 2 May 2022 12:49:06 -0700
Subject: [PATCH] fix: update to resolve nvim breaking changes, format +
 server_capabilities

---
 lua/cosmic/core/commands.lua          |  2 +-
 lua/cosmic/lsp/providers/defaults.lua | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lua/cosmic/core/commands.lua b/lua/cosmic/core/commands.lua
index 0d65f1a..078ebac 100644
--- a/lua/cosmic/core/commands.lua
+++ b/lua/cosmic/core/commands.lua
@@ -9,5 +9,5 @@ vim.cmd([[
   command! CosmicUpdate lua require('cosmic.utils').update()
   command! CosmicReload lua require('cosmic.utils').reload_user_config(true)
   command! CosmicReloadSync lua require('cosmic.utils').reload_user_config_sync()
-  command! LspFormat lua vim.lsp.buf.formatting()
+  command! LspFormat lua vim.lsp.buf.format()
 ]])
diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua
index 64ae832..8bbbeee 100644
--- a/lua/cosmic/lsp/providers/defaults.lua
+++ b/lua/cosmic/lsp/providers/defaults.lua
@@ -14,8 +14,8 @@ function M.on_attach(client, bufnr)
   buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
 
   if config.lsp.can_client_format(client.name) then
-    client.resolved_capabilities.document_formatting = true
-    client.resolved_capabilities.document_range_formatting = true
+    client.server_capabilities.documentFormatting = true
+    client.server_capabilities.documentRangeFormatting = true
     -- check user config to see if we can format on save
     if config.lsp.format_on_save and not auto_format_lock then
       auto_format_lock = true -- just run autocommand once
@@ -30,15 +30,17 @@ function M.on_attach(client, bufnr)
 
       vim.api.nvim_create_autocmd(string.format('BufWritePre %s', format_filetypes), {
         callback = function()
-          vim.lsp.buf.formatting_sync(nil, config.lsp.format_timeout)
+          vim.lsp.buf.format({
+            timeout_ms = config.lsp.format_timeout,
+          })
         end,
         group = group,
         nested = true,
       })
     end
   else
-    client.resolved_capabilities.document_formatting = false
-    client.resolved_capabilities.document_range_formatting = false
+    client.server_capabilities.documentFormatting = false
+    client.server_capabilities.documentRangeFormatting = false
   end
 
   require('cosmic.lsp.mappings').init(client, bufnr)