nvim: move from native formatter to formatter.nvim

This commit is contained in:
mequidis
2022-06-21 06:55:53 +03:00
parent dc7973c1a3
commit a0dd246d06
4 changed files with 35 additions and 3 deletions

View File

@ -66,12 +66,11 @@ vim.keymap.set("n", "<leader>gi", "<cmd>Telescope lsp_implementations<CR>")
vim.keymap.set("n", "<leader>gr", "<cmd>Telescope lsp_references<CR>") vim.keymap.set("n", "<leader>gr", "<cmd>Telescope lsp_references<CR>")
vim.keymap.set("n", "<leader>gq", "<cmd>Telescope diagnostics<CR>") vim.keymap.set("n", "<leader>gq", "<cmd>Telescope diagnostics<CR>")
vim.keymap.set("n", "<leader>gs", "<cmd>LspRestart<CR>") vim.keymap.set("n", "<leader>gs", "<cmd>LspRestart<CR>")
vim.keymap.set("n", "<leader>gf", "<cmd>Format<CR>")
vim.keymap.set("n", "<leader>gF", "<cmd>FormatWrite<CR>")
vim.keymap.set("n", "<leader>ga", function() vim.keymap.set("n", "<leader>ga", function()
vim.lsp.buf.code_action() vim.lsp.buf.code_action()
end) end)
vim.keymap.set("n", "<leader>gf", function()
vim.lsp.buf.formatting()
end)
vim.keymap.set("n", "<leader>gD", function() vim.keymap.set("n", "<leader>gD", function()
vim.lsp.buf.declaration() vim.lsp.buf.declaration()
end) end)

View File

@ -92,6 +92,15 @@ require("packer").startup(function()
end, end,
}) })
-- formatter
use({
"mhartington/formatter.nvim",
cmd = { "Format", "FormatWrite" },
config = function()
require("plugins.formatter")
end,
})
-- dap -- dap
use({ use({
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",

View File

@ -0,0 +1,23 @@
require("formatter").setup {
filetype = {
lua = {
require("formatter.filetypes.lua").stylua,
},
go = {
require("formatter.filetypes.go").gofumpt,
require("formatter.filetypes.go").gofumports,
},
json = {
require("formatter.filetypes.json").jq,
},
python = {
require("formatter.filetypes.python").autopep8,
},
rust = {
require("formatter.filetypes.rust").rustfmt,
},
toml = {
require("formatter.filetypes.toml").taplo,
},
}
}

View File

@ -30,6 +30,7 @@ wk.register({
d = "Go To Definition", d = "Go To Definition",
e = "Show Line Diagnostics", e = "Show Line Diagnostics",
f = "Format Code", f = "Format Code",
F = "Format Code And Write Changes",
i = "Show Implementations", i = "Show Implementations",
k = "Hover", k = "Hover",
n = "Rename", n = "Rename",