diff options
| author | Christian Chiarulli <[email protected]> | 2021-11-06 08:46:32 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-06 08:46:32 +0000 |
| commit | e2bd7fb922d100f7fa955e8e1f7171e800ee15f7 (patch) | |
| tree | ec7697502c448b9b9ac8530aa925b19945d4fdad /lua | |
| parent | b59532307d397fbd90e3c871a2823c40583da5c0 (diff) | |
refactor: deprecate lvim.lang.FOO (#1913) (#1914)
Consolidate configuration styles for linters and formatters
Fixes #1756
Co-authored-by: kylo252 <[email protected]>
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lvim/config/init.lua | 4 | ||||
| -rw-r--r-- | lua/lvim/lsp/null-ls/init.lua | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua index 1dc83c1e..783fb2be 100644 --- a/lua/lvim/config/init.lua +++ b/lua/lvim/config/init.lua @@ -63,9 +63,9 @@ local function handle_deprecated_settings() ---lvim.lang.FOO.lsp for lang, entry in pairs(lvim.lang) do - local deprecated_config = entry["lsp"] or {} + local deprecated_config = entry.formatters or entry.linters or {} if not vim.tbl_isempty(deprecated_config) then - deprecation_notice(string.format("lvim.lang.%s.lsp", lang)) + deprecation_notice(string.format("lvim.lang.%s", lang)) end end end diff --git a/lua/lvim/lsp/null-ls/init.lua b/lua/lvim/lsp/null-ls/init.lua index ef4a1844..5e8c6b11 100644 --- a/lua/lvim/lsp/null-ls/init.lua +++ b/lua/lvim/lsp/null-ls/init.lua @@ -1,8 +1,6 @@ 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") @@ -19,20 +17,6 @@ function M:setup() 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 - 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 |