diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 46bd281..3f542a7 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -110,12 +110,6 @@ vim.g.pcode_unregister_lsp = { vim.g.pcode_null_ls_ensure_installed = { "stylua", } -local formatting = {} -local diagnostics = {} -vim.g.pcode_null_ls_sources = { - formatting.stylua, -- tambahkan di bawah sini - diagnostics.flake8, -- tambahkan di bawah sini -} -- dap instal hanya support linux dan mac -- https://github.com/jay-babu/mason-nvim-dap.nvim/blob/main/lua/mason-nvim-dap/mappings/source.lua diff --git a/lua/custom/null-ls.lua b/lua/custom/null-ls.lua new file mode 100644 index 0000000..206fcd5 --- /dev/null +++ b/lua/custom/null-ls.lua @@ -0,0 +1,10 @@ +local null_ls = require("null-ls") +local formatting = null_ls.builtins.formatting +local diagnostics = null_ls.builtins.diagnostics +local m = { + sources = { + formatting.stylua, -- tambahkan di bawah sini + diagnostics.flake8, -- tambahkan di bawah sini + }, +} +return m diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua index cc27bf4..5317aa0 100644 --- a/lua/user/lsp/null-ls.lua +++ b/lua/user/lsp/null-ls.lua @@ -13,11 +13,15 @@ local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) local sources = {} local ensure_installed = {} +local data_ok, data_sources = pcall(require, "custom.null-ls") +if data_ok then + for _, cfg in pairs(data_sources.sources) do + table.insert(sources, cfg) + end +end + local data_exists, data = pcall(require, "core.config") if data_exists then - for _, cfg in pairs(data.null_ls_sources) do - sources = vim.tbl_deep_extend("force", cfg, sources) - end -- load data null-ls for _, nullls in pairs(data.null_ls_ensure_installed) do table.insert(ensure_installed, nullls)