diff options
Diffstat (limited to 'after/plugin/null-ls.lua')
| -rw-r--r-- | after/plugin/null-ls.lua | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/after/plugin/null-ls.lua b/after/plugin/null-ls.lua index e3027ae..f096baa 100644 --- a/after/plugin/null-ls.lua +++ b/after/plugin/null-ls.lua @@ -1,46 +1,49 @@ local ok, null_ls = pcall(require, "null-ls") if not ok then - return + return end 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.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, + -- 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({ - command = "./vendor/bin/phpstan", + null_ls.builtins.diagnostics.phpstan.with({ + command = "./vendor/bin/phpstan", to_temp_file = false, method = null_ls.methods.DIAGNOSTICS_ON_SAVE, - }), - null_ls.builtins.formatting.pint, - null_ls.builtins.formatting.blade_formatter, + }), + null_ls.builtins.formatting.pint, + null_ls.builtins.formatting.blade_formatter, + laravel_actions.relationships, } local symonfy_sources = { - null_ls.builtins.diagnostics.phpstan.with({ + null_ls.builtins.diagnostics.phpstan.with({ command = "./bin/phpstan", to_temp_file = false, method = null_ls.methods.DIAGNOSTICS_ON_SAVE, }), - null_ls.builtins.diagnostics.phpcs.with({ + null_ls.builtins.diagnostics.phpcs.with({ command = "./bin/phpcs", method = null_ls.methods.DIAGNOSTICS_ON_SAVE, }), @@ -58,7 +61,11 @@ if composer.query({ "require", "laravel/framework" }) ~= nil then end end +-- Only for development to reload sources +-- null_ls.reset_sources() +-- null_ls.register(sources) + null_ls.setup({ - sources = sources, - debug = true, + sources = sources, + debug = true, }) |