migrate: from efm to null-ls ( #500 #504 )

lua/modules/configs/completion/lsp.lua

@@ -1,6 +1,4 @@
 return function()
-	local formatting = require("completion.formatting")
-
 	local nvim_lsp = require("lspconfig")
 	local mason = require("mason")
 	local mason_lspconfig = require("mason-lspconfig")
@@ -33,13 +31,15 @@ return function()
 		},
 	})
 	mason_lspconfig.setup({
+		-- NOTE: use the lsp names in nvim-lspconfig
+		-- https://github.com/williamboman/mason-lspconfig.nvim/blob/main/lua/mason-lspconfig/mappings/server.lua
 		ensure_installed = {
 			"bashls",
 			"clangd",
-			"efm",
 			"gopls",
-			"pyright",
+			"html",
 			"lua_ls",
+			"pyright",
 		},
 	})
 
@@ -85,16 +85,18 @@ return function()
 			nvim_lsp.clangd.setup(final_opts)
 		end,
 
-		efm = function()
-			-- Do not setup efm
-		end,
-
 		gopls = function()
 			local _opts = require("completion.servers.gopls")
 			local final_opts = vim.tbl_deep_extend("keep", _opts, opts)
 			nvim_lsp.gopls.setup(final_opts)
 		end,
 
+		html = function()
+			local _opts = require("completion.servers.html")
+			local final_opts = vim.tbl_deep_extend("keep", _opts, opts)
+			nvim_lsp.html.setup(final_opts)
+		end,
+
 		jsonls = function()
 			local _opts = require("completion.servers.jsonls")
 			local final_opts = vim.tbl_deep_extend("keep", _opts, opts)
@@ -107,70 +109,4 @@ return function()
 			nvim_lsp.lua_ls.setup(final_opts)
 		end,
 	})
-
-	if vim.fn.executable("html-languageserver") then
-		local _opts = require("completion.servers.html")
-		local final_opts = vim.tbl_deep_extend("keep", _opts, opts)
-		nvim_lsp.html.setup(final_opts)
-	end
-
-	local efmls = require("efmls-configs")
-
-	-- Init `efm-langserver` here.
-
-	efmls.init({
-		on_attach = opts.on_attach,
-		capabilities = capabilities,
-		init_options = { documentFormatting = true, codeAction = true },
-	})
-
-	-- Require `efmls-configs-nvim`'s config here
-
-	local vint = require("efmls-configs.linters.vint")
-	local eslint = require("efmls-configs.linters.eslint")
-	local flake8 = require("efmls-configs.linters.flake8")
-
-	local black = require("efmls-configs.formatters.black")
-	local stylua = require("efmls-configs.formatters.stylua")
-	local prettier = require("efmls-configs.formatters.prettier")
-	local shfmt = require("efmls-configs.formatters.shfmt")
-
-	-- Add your own config for formatter and linter here
-
-	-- local rustfmt = require("completion.efm.formatters.rustfmt")
-	local clangfmt = require("completion.efm.formatters.clangfmt")
-
-	-- Override default config here
-
-	flake8 = vim.tbl_extend("force", flake8, {
-		prefix = "flake8: max-line-length=160, ignore F403 and F405",
-		lintStdin = true,
-		lintIgnoreExitCode = true,
-		lintFormats = { "%f:%l:%c: %t%n%n%n %m" },
-		lintCommand = "flake8 --max-line-length 160 --extend-ignore F403,F405 --format '%(path)s:%(row)d:%(col)d: %(code)s %(code)s %(text)s' --stdin-display-name ${INPUT} -",
-	})
-
-	-- Setup formatter and linter for efmls here
-
-	efmls.setup({
-		vim = { formatter = vint },
-		lua = { formatter = stylua },
-		c = { formatter = clangfmt },
-		cpp = { formatter = clangfmt },
-		python = { formatter = black },
-		vue = { formatter = prettier },
-		typescript = { formatter = prettier, linter = eslint },
-		javascript = { formatter = prettier, linter = eslint },
-		typescriptreact = { formatter = prettier, linter = eslint },
-		javascriptreact = { formatter = prettier, linter = eslint },
-		yaml = { formatter = prettier },
-		html = { formatter = prettier },
-		css = { formatter = prettier },
-		scss = { formatter = prettier },
-		sh = { formatter = shfmt },
-		markdown = { formatter = prettier },
-		-- rust = {formatter = rustfmt},
-	})
-
-	formatting.configure_format_on_save()
 end