From d262b6b886d3d39ce2acc8ad74ba8efbaa479657 Mon Sep 17 00:00:00 2001 From: srdusr Date: Sun, 30 Oct 2022 21:58:23 +0200 Subject: changed server settings --- lua/plugins/null-ls.lua | 72 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 10 deletions(-) (limited to 'lua/plugins') diff --git a/lua/plugins/null-ls.lua b/lua/plugins/null-ls.lua index 7fc4377..e1e6ad6 100644 --- a/lua/plugins/null-ls.lua +++ b/lua/plugins/null-ls.lua @@ -3,24 +3,76 @@ if not null_ls_status_ok then return end --- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting +---- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting local formatting = null_ls.builtins.formatting --- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics +---- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics local diagnostics = null_ls.builtins.diagnostics +-- +--local completion = null_ls.builtins.completion +local codeactions = null_ls.builtins.code_actions + +----null_ls.setup({ +---- debug = false, +---- sources = { +---- formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }), +---- formatting.black.with({ extra_args = { "--fast" } }), +---- formatting.stylua, +---- -- diagnostics.flake8 +---- }, +----}) +--require("null-ls").setup({ +-- sources = { +-- require("null-ls").builtins.formatting.stylua, +-- require("null-ls").builtins.diagnostics.eslint, +-- require("null-ls").builtins.completion.spell, +-- }, +--}) --null_ls.setup({ --- debug = false, -- sources = { --- formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }), --- formatting.black.with({ extra_args = { "--fast" } }), +-- formatting.prettier.with({ +-- filetypes = { "html", "css", "javascript", "javascriptreact", "markdown", "json", "yaml" }, +-- }), +-- formatting.black, +-- formatting.eslint_d, -- formatting.stylua, --- -- diagnostics.flake8 +-- formatting.shfmt.with({ +-- filetypes = { "bash", "zsh", "sh" }, +-- }), +-- +-- diagnostics.eslint_d, +-- diagnostics.luacheck, +-- diagnostics.mdl, +-- diagnostics.vint, +-- +-- codeactions.eslint_d, -- }, +-- on_attach = function(client) +-- if client.resolved_capabilities.document_formatting then +-- vim.cmd("autocmd BufWritePre lua vim.lsp.buf.format()") +-- end +-- end, --}) -require("null-ls").setup({ + +null_ls.setup({ + debug = true, sources = { - require("null-ls").builtins.formatting.stylua, - require("null-ls").builtins.diagnostics.eslint, - require("null-ls").builtins.completion.spell, + formatting.prettierd, + formatting.stylua, + formatting.shfmt.with({ + filetypes = { "bash", "zsh", "sh" }, + }), }, + on_attach = function(client, bufnr) + if client.server_capabilities.document_formatting then + local group = vim.api.nvim_create_augroup("NullLsFormatting", { clear = true }) + vim.api.nvim_create_autocmd("BufWritePre", { + callback = function() + vim.lsp.buf.formatting_sync(nil, 4000) + end, + buffer = bufnr, + group = group, + }) + end + end, }) -- cgit v1.2.3