From ecd05b4454326bcaa2f6742721641046dc9c2bdf Mon Sep 17 00:00:00 2001
From: ray <gitea@rayelliott.dev>
Date: Sun, 10 Oct 2021 18:53:47 +0100
Subject: [PATCH] fix efm and lsp-config tsserver formatting conflicts

---
 lua/init-efm-langserver.lua |   2 +-
 lua/init-lspconfig.lua      |   5 +++++
 spell/en.utf-8.add          |   2 ++
 spell/en.utf-8.add.spl      | Bin 2284 -> 2320 bytes
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lua/init-efm-langserver.lua b/lua/init-efm-langserver.lua
index d685bfe..7af7b43 100644
--- a/lua/init-efm-langserver.lua
+++ b/lua/init-efm-langserver.lua
@@ -41,7 +41,7 @@ local luaformat = {
 local util = require "lspconfig".util
 local on_attach_efm = function(client)
   if client.resolved_capabilities.document_formatting then
-    vim.cmd [[augroup efm_formatting]]
+    vim.cmd [[augroup lsp_formatting]]
     vim.cmd [[autocmd!]]
 		vim.cmd [[autocmd BufWritePre <buffer> :lua vim.lsp.buf.formatting_seq_sync({}, 1000)]]
     vim.cmd [[augroup END]]
diff --git a/lua/init-lspconfig.lua b/lua/init-lspconfig.lua
index ad125d6..2b38694 100644
--- a/lua/init-lspconfig.lua
+++ b/lua/init-lspconfig.lua
@@ -54,6 +54,11 @@ local on_attach = function(client, bufnr)
   -- buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
   -- buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
 
+	if client.name == 'tsserver' then
+		print('tsserver - disabling formatting')
+		client.resolved_capabilities.document_formatting = false;
+	end
+
   if client.resolved_capabilities.document_formatting then
     vim.cmd [[augroup lsp_formatting]]
     vim.cmd [[autocmd!]]
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index d309946..8fcd875 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -176,3 +176,5 @@ movie
 multivariable
 Unsetting
 ajax
+mimetype
+thumbnailers
diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl
index 9eee6c13444aa241f418065cdfcd20a3d037783f..0e337da26be811c004826d748cd17eaec09638df 100644
GIT binary patch
delta 129
zcmaDOI6;Un%+t5HAT=k)=syDktIb9}Hx_=T+&soq#uCO#Mn(pPy9JxWSe7s{a!>xv
z8s*HAnvq|`n9Eqem;;n#TAj#P3gjg*<}oHRW&*`hfuf8Pi<m&9dJ0H?Mm|s~kFgl2
VB@@VJ7Ma}0X3RKs^Hw%<CIEkO9@qc?

delta 71
zcmbOr^hS^`%+t5HAT=k)=syDktHMS;Hx?$wyv@lhOBflMCUdYw2{5PT7cu5C7BJ>8
bGBPl&PMqAyCe6q_c`2JQW6$QBZ01Y=#!M3q