From 52b74557415eb757ad4b7481b0aec8a3f98dd58d Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Sun, 10 Oct 2021 21:07:41 +0200
Subject: feat: add an independent lvim namespace (#1699)

---
 lua/lvim/lsp/null-ls/init.lua | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 lua/lvim/lsp/null-ls/init.lua

(limited to 'lua/lvim/lsp/null-ls/init.lua')

diff --git a/lua/lvim/lsp/null-ls/init.lua b/lua/lvim/lsp/null-ls/init.lua
new file mode 100644
index 00000000..f2d3216d
--- /dev/null
+++ b/lua/lvim/lsp/null-ls/init.lua
@@ -0,0 +1,32 @@
+local M = {}
+
+local Log = require "lvim.core.log"
+local formatters = require "lvim.lsp.null-ls.formatters"
+local linters = require "lvim.lsp.null-ls.linters"
+
+function M:setup()
+  local status_ok, null_ls = pcall(require, "null-ls")
+  if not status_ok then
+    Log:error "Missing null-ls dependency"
+    return
+  end
+
+  null_ls.config()
+  require("lspconfig")["null-ls"].setup(lvim.lsp.null_ls.setup)
+  for filetype, config in pairs(lvim.lang) do
+    if not vim.tbl_isempty(config.formatters) then
+      vim.tbl_map(function(c)
+        c.filetypes = { filetype }
+      end, config.formatters)
+      formatters.setup(config.formatters)
+    end
+    if not vim.tbl_isempty(config.linters) then
+      vim.tbl_map(function(c)
+        c.filetypes = { filetype }
+      end, config.formatters)
+      linters.setup(config.linters)
+    end
+  end
+end
+
+return M
-- 
cgit v1.2.3


From f87416c141de0909a05f1d1cad162a9774def549 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Thu, 14 Oct 2021 18:58:56 +0200
Subject: fix(null-ls): add common lsp-setup hooks (#1763)

---
 lua/lvim/lsp/null-ls/init.lua | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lua/lvim/lsp/null-ls/init.lua')

diff --git a/lua/lvim/lsp/null-ls/init.lua b/lua/lvim/lsp/null-ls/init.lua
index f2d3216d..ef4a1844 100644
--- a/lua/lvim/lsp/null-ls/init.lua
+++ b/lua/lvim/lsp/null-ls/init.lua
@@ -12,6 +12,12 @@ function M:setup()
   end
 
   null_ls.config()
+  local default_opts = require("lvim.lsp").get_common_opts()
+
+  if vim.tbl_isempty(lvim.lsp.null_ls.setup or {}) then
+    lvim.lsp.null_ls.setup = default_opts
+  end
+
   require("lspconfig")["null-ls"].setup(lvim.lsp.null_ls.setup)
   for filetype, config in pairs(lvim.lang) do
     if not vim.tbl_isempty(config.formatters) then
-- 
cgit v1.2.3