mirror of
https://github.com/pojokcodeid/nvim-lazy.git
synced 2025-06-24 17:58:46 +02:00
rollback: config with conform
This commit is contained in:
parent
33fe8d43df
commit
22fef75144
6 changed files with 11 additions and 111 deletions
|
@ -134,45 +134,6 @@ if pcode.active_golang_config then
|
|||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"mfussenegger/nvim-lint",
|
||||
events = { "BufWritePost", "BufReadPost", "InsertLeave" },
|
||||
opts = function(_, opts)
|
||||
opts.linters_by_ft = opts.linters_by_ft or {}
|
||||
opts.linters_by_ft.go = { "golangcilint" }
|
||||
return opts
|
||||
end,
|
||||
config = function(_, opts)
|
||||
require("lint").linters_by_ft = opts.linters_by_ft
|
||||
end,
|
||||
},
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
opts = function(_, opts)
|
||||
local psave = pcode.format_on_save or 0
|
||||
opts.formatters_by_ft = opts.formatters_by_ft or {}
|
||||
opts.formatters_by_ft.go = { "gofmt" }
|
||||
if psave == 1 then
|
||||
opts.format_on_save = {
|
||||
timeout_ms = pcode.format_timeout_ms or 500,
|
||||
lsp_fallback = true,
|
||||
}
|
||||
end
|
||||
return opts
|
||||
end,
|
||||
config = function(_, opts)
|
||||
local conform = require("conform")
|
||||
conform.setup(opts)
|
||||
vim.keymap.set({ "n", "v" }, "<leader>lF", function()
|
||||
conform.format({
|
||||
lsp_fallback = true,
|
||||
async = false,
|
||||
timeout_ms = pcode.format_timeout_ms or 500,
|
||||
})
|
||||
end, { desc = "Format file or range (in visual mode)" })
|
||||
end,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -106,45 +106,6 @@ if pcode.active_php_config then
|
|||
{ "<Leader>TS", function() require("neotest").run.stop() end, desc = "Stop" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
opts = function(_, opts)
|
||||
local psave = pcode.format_on_save or 0
|
||||
opts.formatters_by_ft = opts.formatters_by_ft or {}
|
||||
opts.formatters_by_ft.php = { "php-cs-fixer" }
|
||||
if psave == 1 then
|
||||
opts.format_on_save = {
|
||||
timeout_ms = pcode.format_timeout_ms or 500,
|
||||
lsp_fallback = true,
|
||||
}
|
||||
end
|
||||
return opts
|
||||
end,
|
||||
config = function(_, opts)
|
||||
local conform = require("conform")
|
||||
conform.setup(opts)
|
||||
vim.keymap.set({ "n", "v" }, "<leader>lF", function()
|
||||
conform.format({
|
||||
lsp_fallback = true,
|
||||
async = false,
|
||||
timeout_ms = pcode.format_timeout_ms or 500,
|
||||
})
|
||||
end, { desc = "Format file or range (in visual mode)" })
|
||||
end,
|
||||
},
|
||||
{
|
||||
"mfussenegger/nvim-lint",
|
||||
events = { "BufWritePost", "BufReadPost", "InsertLeave" },
|
||||
opts = function(_, opts)
|
||||
opts.linters_by_ft = opts.linters_by_ft or {}
|
||||
opts.linters_by_ft.php = { "phpcs" }
|
||||
return opts
|
||||
end,
|
||||
config = function(_, opts)
|
||||
require("lint").linters_by_ft = opts.linters_by_ft
|
||||
end,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -51,6 +51,8 @@ if pcode.active_php_config then
|
|||
table.insert(pcode.treesitter_ensure_installed, ts)
|
||||
end
|
||||
table.insert(pcode.mason_ensure_installed, "intelephense")
|
||||
table.insert(pcode.null_ls_ensure_installed, "phpcbf")
|
||||
table.insert(pcode.null_ls_ensure_installed, "phpcs")
|
||||
end
|
||||
-- run if golang config true
|
||||
if pcode.active_golang_config then
|
||||
|
@ -59,6 +61,8 @@ if pcode.active_golang_config then
|
|||
table.insert(pcode.treesitter_ensure_installed, ts)
|
||||
end
|
||||
table.insert(pcode.mason_ensure_installed, "gopls")
|
||||
table.insert(pcode.null_ls_ensure_installed, "ast_grep")
|
||||
table.insert(pcode.null_ls_ensure_installed, "gofumpt")
|
||||
end
|
||||
-- run if python config true
|
||||
if pcode.active_python_config then
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue