Switch to conform
This commit is contained in:
parent
2a57c86a77
commit
5fe85e471d
4 changed files with 32 additions and 14 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -22,3 +22,6 @@
|
||||||
[submodule "bundle/nvim-lspconfig"]
|
[submodule "bundle/nvim-lspconfig"]
|
||||||
path = bundle/nvim-lspconfig
|
path = bundle/nvim-lspconfig
|
||||||
url = https://github.com/neovim/nvim-lspconfig.git
|
url = https://github.com/neovim/nvim-lspconfig.git
|
||||||
|
[submodule "bundle/conform"]
|
||||||
|
path = bundle/conform
|
||||||
|
url = https://github.com/stevearc/conform.nvim.git
|
||||||
|
|
|
||||||
1
bundle/conform
Submodule
1
bundle/conform
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit c2526f1cde528a66e086ab1668e996d162c75f4f
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 7cc2214a4a2f9772426a21b32bec9d87cd89dfa8
|
|
||||||
41
lua/init.lua
41
lua/init.lua
|
|
@ -59,22 +59,37 @@ require("nvim-treesitter.configs").setup {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
require("nvim-format-buffer").setup({
|
require("conform").setup({
|
||||||
verbose = false,
|
formatters_by_ft = {
|
||||||
format_rules = {
|
c = { "clang-format" },
|
||||||
{ pattern = { "*.c", "*.h", "*.cpp", "*.hpp" }, command = "clang-format" },
|
cpp = { "clang-format" },
|
||||||
{ pattern = { "*.rs" }, command = "rustfmt" },
|
rust = { "rustfmt" },
|
||||||
{
|
python = { "ruff_fix", "ruff_format" },
|
||||||
pattern = { "*.js", "*.mjs", "*.ts", "*.mts", "*.cjs", "*.tsx", "*.vue", "*.css" },
|
javascript = { "prettier" },
|
||||||
command = function()
|
typescript = { "prettier" },
|
||||||
return "prettier --stdin-filepath " .. vim.api.nvim_buf_get_name(0)
|
vue = { "prettier" },
|
||||||
end,
|
},
|
||||||
},
|
format_on_save = {
|
||||||
{ pattern = { "*.sql" }, command = "pg_format --spaces=2 --wrap-limit=1000 --no-rcfile" },
|
timeout_ms = 1000,
|
||||||
{ pattern = { "*.py", "*.pyi" }, command = "ruff check --select I --fix --silent - | ruff format -" }
|
lsp_format = "fallback",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- require("nvim-format-buffer").setup({
|
||||||
|
-- format_rules = {
|
||||||
|
-- { pattern = { "*.c", "*.h", "*.cpp", "*.hpp" }, command = "clang-format" },
|
||||||
|
-- { pattern = { "*.rs" }, command = "rustfmt" },
|
||||||
|
-- {
|
||||||
|
-- pattern = { "*.js", "*.mjs", "*.ts", "*.mts", "*.cjs", "*.tsx", "*.vue", "*.css" },
|
||||||
|
-- command = function()
|
||||||
|
-- return "prettier --stdin-filepath " .. vim.api.nvim_buf_get_name(0)
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
-- { pattern = { "*.sql" }, command = "pg_format --spaces=2 --wrap-limit=1000 --no-rcfile" },
|
||||||
|
-- { pattern = { "*.py", "*.pyi" }, command = "ruff check --select I --fix --silent - | ruff format -" }
|
||||||
|
-- },
|
||||||
|
-- })
|
||||||
|
|
||||||
require("vim.lsp.log").set_format_func(vim.inspect)
|
require("vim.lsp.log").set_format_func(vim.inspect)
|
||||||
vim.lsp.set_log_level("error")
|
vim.lsp.set_log_level("error")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue