aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriel D'Alessandro <dalessandro.ariel@gmail.com>2023-01-08 20:17:00 +0100
committerAriel D'Alessandro <dalessandro.ariel@gmail.com>2023-01-08 20:17:00 +0100
commit927037c181f379076ab295db0a65e7f713c05a10 (patch)
treec5dbdaad8ed1182d62b300bd9100b947f10e707a
parenta5e69083458cd3e9b93c5580b2c258ad231d65a1 (diff)
downloadnvim-conf-927037c181f379076ab295db0a65e7f713c05a10.tar.gz
nvim-conf-927037c181f379076ab295db0a65e7f713c05a10.zip
feat: refactor null ls into lsp module
-rw-r--r--after/plugin/null-ls.lua80
-rw-r--r--lua/alpha/lsp/init.lua2
-rw-r--r--lua/alpha/lsp/null-ls.lua36
3 files changed, 38 insertions, 80 deletions
diff --git a/after/plugin/null-ls.lua b/after/plugin/null-ls.lua
deleted file mode 100644
index 7bccec2..0000000
--- a/after/plugin/null-ls.lua
+++ /dev/null
@@ -1,80 +0,0 @@
-local ok, null_ls = pcall(require, "null-ls")
-if not ok then
- return
-end
-
-local composer = require("composer")
-local php_actions = require("php-code-actions")
-local laravel_actions = require("laravel.code-actions")
-
-
--- format and code actions for non lsp buffers
-vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, {})
-vim.keymap.set("n", "<leader>vf", function()
- return vim.lsp.buf.format({ async = true })
-end, {})
-
-local sources = {
- null_ls.builtins.code_actions.gitsigns,
- -- null_ls.builtins.formatting.stylua,
- -- null_ls.builtins.diagnostics.eslint,
- -- null_ls.builtins.formatting.phpcsfixer,
- -- null_ls.builtins.diagnostics.golangci_lint,
- -- null_ls.builtins.diagnostics.codespell.with({
- -- args = { "--ignore-words-list", "crate" },
- -- }),
- null_ls.builtins.formatting.jq,
- -- null_ls.builtins.code_actions.gitrebase,
- null_ls.builtins.code_actions.refactoring,
- -- null_ls.builtins.formatting.sql_formatter,
- php_actions.getter_setter,
- php_actions.file_creator,
-}
-
--- Maybe sources per type of project
-local laravel_sources = {
- null_ls.builtins.diagnostics.phpstan.with({
- to_temp_file = false,
- method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
- }),
- null_ls.builtins.formatting.pint,
- null_ls.builtins.formatting.blade_formatter,
- laravel_actions.relationships,
-}
-
-local symonfy_sources = {
- null_ls.builtins.diagnostics.phpstan.with({
- to_temp_file = false,
- method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
- }),
- null_ls.builtins.diagnostics.phpcs.with({
- method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
- }),
-}
-
-if composer.query({ "require", "symfony/framework-bundle" }) ~= nil then
- for _, source in ipairs(symonfy_sources) do
- table.insert(sources, source)
- end
-elseif composer.query({ "require", "laravel/framework" }) ~= nil then
- for _, source in ipairs(laravel_sources) do
- table.insert(sources, source)
- end
-else
- table.insert(
- sources,
- null_ls.builtins.diagnostics.phpstan.with({
- to_temp_file = false,
- method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
- })
- )
-end
-
--- Only for development to reload sources
--- null_ls.reset_sources()
--- null_ls.register(sources)
-
-null_ls.setup({
- sources = sources,
- debug = true,
-})
diff --git a/lua/alpha/lsp/init.lua b/lua/alpha/lsp/init.lua
index 86b06a6..c29472d 100644
--- a/lua/alpha/lsp/init.lua
+++ b/lua/alpha/lsp/init.lua
@@ -10,3 +10,5 @@ require('mason-lspconfig').setup_handlers({
lspconfig[server_name].setup(setups[server_name]())
end
})
+
+require('alpha.lsp.null-ls')
diff --git a/lua/alpha/lsp/null-ls.lua b/lua/alpha/lsp/null-ls.lua
new file mode 100644
index 0000000..f7f925c
--- /dev/null
+++ b/lua/alpha/lsp/null-ls.lua
@@ -0,0 +1,36 @@
+local null_ls = require("null-ls")
+local composer = require("composer")
+local php_actions = require("php-code-actions")
+local laravel_actions = require("laravel.code-actions")
+
+local sources = {
+ null_ls.builtins.code_actions.gitsigns,
+ null_ls.builtins.formatting.jq,
+ null_ls.builtins.code_actions.refactoring,
+
+ php_actions.getter_setter,
+ php_actions.file_creator,
+
+ null_ls.builtins.diagnostics.phpstan.with({
+ to_temp_file = false,
+ method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
+ }),
+}
+
+if composer.query({ "require", "symfony/framework-bundle" }) ~= nil then
+ table.insert(sources, null_ls.builtins.diagnostics.phpcs.with({
+ method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
+ }))
+elseif composer.query({ "require", "laravel/framework" }) ~= nil then
+ table.insert(sources, null_ls.builtins.formatting.pint)
+ table.insert(sources, laravel_actions.relationships)
+end
+
+null_ls.setup({
+ sources = sources,
+})
+
+vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, {})
+vim.keymap.set("n", "<leader>vf", function()
+ return vim.lsp.buf.format({ async = true })
+end, {})