fix: format on save tidak respon jika menggunakan lsp format

This commit is contained in:
asep.komarudin 2024-06-29 08:40:58 +07:00
parent 2e64635d7e
commit f5f74f80e0
6 changed files with 159 additions and 157 deletions

View file

@ -38,12 +38,17 @@ pcode.progress = 1
-- 4 = off -- 4 = off
pcode.show_mode = 3 pcode.show_mode = 3
-- 1 ( format jalan) 0 (fromat off) -- true or false
pcode.format_on_save = 1 pcode.format_on_save = true
pcode.format_timeout_ms = 5000 pcode.format_timeout_ms = 5000
pcode.treesitter_ensure_installed = {} -- https://github.com/mfussenegger/nvim-lint
-- https://github.com/stevearc/conform.nvim
-- use conform and nvim-lint if set true
pcode.disable_null_ls = true
pcode.treesitter_ensure_installed = {}
pcode.tscontext = false
-- ini hanya untuk lsp yg tidak support masson -- ini hanya untuk lsp yg tidak support masson
-- untuk referesi support language kunjungi link dibawah -- untuk referesi support language kunjungi link dibawah
-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
@ -65,7 +70,7 @@ pcode.mason_ensure_installed = { -- sebelumnya register_lsp
-- tambahkan di bawah sini setelah melakukan :masoninstall -- tambahkan di bawah sini setelah melakukan :masoninstall
} }
pcode.unregister_lsp = { pcode.unregister_lsp = {
-- "jdtls", -- tambahkan di bawah ini "jdtls", -- tambahkan di bawah ini
} }
-- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md
@ -153,7 +158,7 @@ pcode.database = false
pcode.rest_client = true pcode.rest_client = true
-- https://github.com/mfussenegger/nvim-dap -- https://github.com/mfussenegger/nvim-dap
pcode.nvim_dap = false -- not support for windows os (auto config mason-nvim-dap) pcode.nvim_dap = true -- not support for windows os (auto config mason-nvim-dap)
-- conefig special support test & dap -- conefig special support test & dap
pcode.active_rust_config = false pcode.active_rust_config = false
@ -167,6 +172,6 @@ pcode.active_golang_config = false
pcode.active_python_config = false pcode.active_python_config = false
pcode.active_cpp_config = false pcode.active_cpp_config = false
pcode.active_java_config = { pcode.active_java_config = {
active = false, active = true,
project = "gradle", -- gradle or maven project = "gradle", -- gradle or maven
} }

View file

@ -2,9 +2,11 @@ return {
{ {
"nvimtools/none-ls.nvim", "nvimtools/none-ls.nvim",
lazy = true, lazy = true,
enabled = not (pcode.disable_null_ls or false),
dependencies = { dependencies = {
{ {
"jayp0521/mason-null-ls.nvim", "jayp0521/mason-null-ls.nvim",
event = "VeryLazy",
opts = { opts = {
ensure_installed = pcode.null_ls_ensure_installed or {}, ensure_installed = pcode.null_ls_ensure_installed or {},
automatic_setup = true, automatic_setup = true,
@ -17,65 +19,7 @@ return {
"nvimtools/none-ls-extras.nvim", "nvimtools/none-ls-extras.nvim",
}, },
event = "InsertEnter", event = "InsertEnter",
opts = function() opts = {},
local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) config = true,
local sources = {}
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 on_save = pcode.format_on_save or 0
if on_save == 1 then
return {
debug = false,
sources = sources,
on_attach = function(client, bufnr)
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
local filetype = vim.bo.filetype
local n = require("null-ls")
local s = require("null-ls.sources")
local method = n.methods.FORMATTING
local available_formatters = s.get_available(filetype, method)
if
(#available_formatters > 0 and client.name == "null-ls")
or client.supports_method("textDocument/formatting")
then
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = pcode.format_timeout_ms or 5000 })
end,
})
else
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = pcode.format_timeout_ms or 5000, filter = nil })
end,
})
end
end,
}
else
vim.schedule(function()
pcall(function()
vim.api.nvim_clear_autocmds({ group = "LspFormatting" })
end)
end)
return {
debug = false,
sources = sources,
}
end
end,
config = function(_, opts)
require("null-ls").setup(opts)
end,
}, },
} }

View file

@ -62,7 +62,24 @@ local function attach_navic(client, bufnr)
navic.attach(client, bufnr) navic.attach(client, bufnr)
end end
local function lsp_keymaps(bufnr) function FORMAT_FILTER(client)
local filetype = vim.bo.filetype
local n = require("null-ls")
local s = require("null-ls.sources")
local method = n.methods.FORMATTING
local available_formatters = s.get_available(filetype, method)
if #available_formatters > 0 then
return client.name == "null-ls"
elseif client.supports_method("textDocument/formatting") then
return true
else
return false
end
end
-- stylua: ignore
local function lsp_keymaps(bufnr, on_save)
local opts = { noremap = true, silent = true } local opts = { noremap = true, silent = true }
local keymap = vim.api.nvim_buf_set_keymap local keymap = vim.api.nvim_buf_set_keymap
keymap(bufnr, "n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts) keymap(bufnr, "n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
@ -80,6 +97,23 @@ local function lsp_keymaps(bufnr)
keymap(bufnr, "n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>", opts) keymap(bufnr, "n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>", opts)
keymap(bufnr, "n", "<leader>ls", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts) keymap(bufnr, "n", "<leader>ls", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
keymap(bufnr, "n", "<leader>lq", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts) keymap(bufnr, "n", "<leader>lq", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts)
if on_save then
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.format({ bufnr = bufnr, timeout_ms = pcode.format_timeout_ms or 5000, filter = FORMAT_FILTER })
end,
})
else
vim.schedule(function()
pcall(function()
vim.api.nvim_clear_autocmds({ group = "LspFormatting" })
end)
end)
end
end end
M.on_attach = function(client, bufnr) M.on_attach = function(client, bufnr)
attach_navic(client, bufnr) attach_navic(client, bufnr)
@ -96,7 +130,13 @@ M.on_attach = function(client, bufnr)
vim.lsp.inlay_hint.enable(true) vim.lsp.inlay_hint.enable(true)
end end
lsp_keymaps(bufnr) local on_save = pcode.format_on_save or false
-- disable if conform active
local status, _ = pcall(require, "conform")
if status then
on_save = false
end
lsp_keymaps(bufnr, on_save)
local status_ok, illuminate = pcall(require, "illuminate") local status_ok, illuminate = pcall(require, "illuminate")
if not status_ok then if not status_ok then
return return

View file

@ -1,10 +1,14 @@
local null_ls = require("null-ls") local ok, null_ls = pcall(require, "null-ls")
local M = {} local M = {}
M.list_registered = function(filetype) M.list_registered = function(filetype)
if ok then
local method = null_ls.methods.FORMATTING local method = null_ls.methods.FORMATTING
local registered_providers = require("user.utils.lsp").list_registered_providers_names(filetype) local registered_providers = require("user.utils.lsp").list_registered_providers_names(filetype)
return registered_providers[method] or {} return registered_providers[method] or {}
else
return {}
end
end end
M.list_registered_all = function() M.list_registered_all = function()

View file

@ -1,19 +1,27 @@
local null_ls = require("null-ls") local ok, null_ls = pcall(require, "null-ls")
local M = {} local M = {}
M.alternative_methods = { if ok then
M.alternative_methods = {
null_ls.methods.DIAGNOSTICS, null_ls.methods.DIAGNOSTICS,
null_ls.methods.DIAGNOSTICS_ON_OPEN, null_ls.methods.DIAGNOSTICS_ON_OPEN,
null_ls.methods.DIAGNOSTICS_ON_SAVE, null_ls.methods.DIAGNOSTICS_ON_SAVE,
} }
else
M.alternative_methods = {}
end
M.linter_list_registered = function(filetype) M.linter_list_registered = function(filetype)
if ok then
local registered_providers = require("user.utils.lsp").list_registered_providers_names(filetype) local registered_providers = require("user.utils.lsp").list_registered_providers_names(filetype)
local providers_for_methods = vim.iter(vim.tbl_map(function(m) local providers_for_methods = vim.iter(vim.tbl_map(function(m)
return registered_providers[m] or {} return registered_providers[m] or {}
end, M.alternative_methods)) end, M.alternative_methods))
return providers_for_methods return providers_for_methods
else
return {}
end
end end
return M return M

View file

@ -93,7 +93,8 @@ return {
if type(msg) == "boolean" or #msg == 0 then if type(msg) == "boolean" or #msg == 0 then
return "LSP Inactive" return "LSP Inactive"
end end
return msg -- return msg
table.insert(buf_client_names, msg)
end end
-- add client -- add client
for _, client in pairs(buf_clients) do for _, client in pairs(buf_clients) do