diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
index a564595..1c81823 100644
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -61,8 +61,8 @@ protocol.CompletionItemKind = {
 local ts_utils_setup = function(client, bufnr, opts)
   if client.name == 'tsserver' then
     -- Disable tsserver formatting, we want formatting via prettier
-    client.resolved_capabilities.document_formatting       = false
-    client.resolved_capabilities.document_range_formatting = false
+    client.server_capabilities.documentFormattingProvider      = false
+    client.server_capabilities.documentRangeFormattingProvider = false
 
     ts_utils.setup {
       debug                          = false,
@@ -125,25 +125,26 @@ local on_attach = function(client, bufnr)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<Leader>k', '<cmd>lua vim.lsp.buf.hover()<CR>'            , opts)
   vim.api.nvim_buf_set_keymap(bufnr, 'n', '<Leader>S', '<cmd>lua vim.lsp.buf.signature_help()<CR>'   , opts)
 
-  if client.resolved_capabilities.code_action then
+  if client.server_capabilities.codeActionProvider then
     vim.api.nvim_buf_set_keymap(bufnr, 'n', 'ga'       , '<cmd>lua vim.lsp.buf.code_action()<CR>'      , opts)
     vim.api.nvim_buf_set_keymap(bufnr, 'v', 'ga'       , '<cmd>lua vim.lsp.buf.range_code_action()<CR>', opts)
     vim.api.nvim_buf_set_keymap(bufnr, 'n', '<Leader>r', '<cmd>lua vim.lsp.buf.code_action{ only = \'refactor\' }<CR>'      , opts)
     vim.api.nvim_buf_set_keymap(bufnr, 'v', '<Leader>r', '<cmd>lua vim.lsp.buf.range_code_action{ only = \'refactor\' }<CR>', opts)
   end
 
-  if client.resolved_capabilities.document_range_formatting then
+  if client.server_capabilities.documentRangeFormattingProvider then
     vim.api.nvim_buf_set_keymap(bufnr, 'x', 'gq', '<cmd>lua FormatRangeOperator()<CR>', opts)
   end
-  if client.resolved_capabilities.document_formatting then
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gq', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+
+  if client.server_capabilities.documentFormattingProvider then
+    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gq', '<cmd>lua vim.lsp.buf.format({async=true})<CR>', opts)
   end
 
-  if client.resolved_capabilities.code_lens or client.resolved_capabilities.document_highlight then
+  if client.server_capabilities.codeLensProvider or client.server_capabilities.documentHighlightProvider then
     vim.api.nvim_create_augroup("LSP", {clear = true})
   end
 
-  if client.resolved_capabilities.code_lens then
+  if client.server_capabilities.codeLensProvider then
     vim.api.nvim_buf_set_keymap(bufnr, "n", "<Leader>l", "<cmd>lua vim.lsp.codelens.run()<CR>", opts)
     vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI", "InsertLeave"}, {
       group   = "LSP",
@@ -161,7 +162,7 @@ local on_attach = function(client, bufnr)
     })
   end
 
-  if client.resolved_capabilities.document_highlight then
+  if client.server_capabilities.documentHighlightProvider then
     vim.api.nvim_create_autocmd("CursorHold", {
       group   = "LSP",
       buffer  = bufnr,