service was a good idea, thank you tasty

3 files changed, 14 insertions, 13 deletions

diff --git a/lua/default-config.lua b/lua/default-config.lua
index de7a8a36..3bfc7649 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -57,8 +57,8 @@ lvim = {
 }
 
 local schemas = nil
-local common_on_attach = require("lsp.utils").common_on_attach
-local common_capabilities = require("lsp.utils").common_capabilities()
+local common_on_attach = require("lsp.service").common_on_attach
+local common_capabilities = require("lsp.service").common_capabilities()
 local status_ok, jsonls_settings = pcall(require, "nlspsettings.jsonls")
 if status_ok then
   schemas = jsonls_settings.get_default_schemas()
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index ba22b931..f606e1d8 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -1,4 +1,5 @@
 local utils = require "utils"
+local service = require "lsp.service"
 local lsp_config = {}
 
 function lsp_config.config()
@@ -13,18 +14,10 @@ function lsp_config.config()
   }
 end
 
-local function no_formatter_on_attach(client, bufnr)
-  if lvim.lsp.on_attach_callback then
-    lvim.lsp.on_attach_callback(client, bufnr)
-  end
-  require("lsp.utils").lsp_highlight_document(client)
-  client.resolved_capabilities.document_formatting = false
-end
-
 function lsp_config.setup(lang)
   local lang_server = lvim.lang[lang].lsp
   local provider = lang_server.provider
-  if require("utils").check_lsp_client_active(provider) then
+  if utils.check_lsp_client_active(provider) then
     return
   end
 
@@ -49,13 +42,13 @@ function lsp_config.setup(lang)
 
     if utils.is_table(method) then
       if utils.has_value(method, format_method) then
-        lang_server.setup.on_attach = no_formatter_on_attach
+        lang_server.setup.on_attach = service.no_formatter_on_attach
       end
     end
 
     if utils.is_string(method) then
       if method == format_method then
-        lang_server.setup.on_attach = no_formatter_on_attach
+        lang_server.setup.on_attach = service.no_formatter_on_attach
       end
     end
   end
diff --git a/lua/lsp/utils.lua b/lua/lsp/service.lua
index 3969a202..0c49bacd 100644
--- a/lua/lsp/utils.lua
+++ b/lua/lsp/service.lua
@@ -98,6 +98,14 @@ function M.common_on_attach(client, bufnr)
   lsp_highlight_document(client)
 end
 
+function M.no_formatter_on_attach(client, bufnr)
+  if lvim.lsp.on_attach_callback then
+    lvim.lsp.on_attach_callback(client, bufnr)
+  end
+  lsp_highlight_document(client)
+  client.resolved_capabilities.document_formatting = false
+end
+
 function M.common_capabilities()
   local capabilities = vim.lsp.protocol.make_client_capabilities()
   capabilities.textDocument.completion.completionItem.snippetSupport = true