Compare commits

...

2 commits

Author SHA1 Message Date
9f20f42d38 reselect after indenting in visual 2023-10-01 16:49:56 +02:00
c66b3f00bd formatting configs 2023-10-01 16:49:47 +02:00
2 changed files with 23 additions and 4 deletions

View file

@ -144,8 +144,8 @@ map('x', '>', '>gv|', { desc = 'Indent Left and Re-select' })
-- Arrows to move identation in normal mode
map('n', '<LEFT>', '<<', { desc = 'Indent Right and Re-select' })
map('n', '<RIGHT>', '>>', { desc = 'Indent Left and Re-select' })
map('v', '<LEFT>', '<', { desc = 'Indent Right and Re-select' })
map('v', '<RIGHT>', '>', { desc = 'Indent Left and Re-select' })
map('v', '<LEFT>', '>gv|', { desc = 'Indent Right and Re-select' })
map('v', '<RIGHT>', '<gv', { desc = 'Indent Left and Re-select' })
-- Use tab for indenting in visual/select mode
map('x', '<Tab>', '>gv|', { desc = 'Indent Left' })

View file

@ -1,6 +1,9 @@
-- This is part of LazyVim's code, with my modifications.
-- See: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/plugins/extras/formatting/prettier.lua
local util = require("formatter.util")
local defaults = require("formatter.defaults")
return {
{
@ -21,8 +24,6 @@ return {
opts = function(_, opts)
opts = opts or {}
local filetypes = {
-- FIXME:add more filetypes
json = { require("formatter.defaults.prettierd") },
rust = {
rustfmt = function()
return {
@ -32,10 +33,28 @@ return {
}
end,
},
cpp = { require("formatter.filetypes.cpp").clangformat },
css = { require("formatter.filetypes.css").prettierd },
html = { require("formatter.filetypes.html").prettierd },
java = { require("formatter.filetypes.java").clangformat() },
javascript = { require("formatter.filetypes.javascript").prettierd },
json = { require("formatter.filetypes.json").prettierd },
cmake = { require("formatter.filetypes.cmake") },
latex = { require("formatter.filetypes.latex").latexindent },
markdown = { require("formatter.filetypes.markdown").prettierd },
php = { require("formatter.filetypes.php").phpcbf },
python = { require("formatter.filetypes.python").autopep8() },
sh = { require("formatter.filetypes.sh").shfmt() },
sql = { require("formatter.filetypes.sql").pgformat() },
toml = { require("formatter.filetypes.toml").taplo() },
go = { require("formatter.filetypes.go").gofmt() },
yaml = { require("formatter.filetypes.yaml").prettierd },
c = { require("formatter.filetypes.c").clangformat },
["*"] = {
-- "formatter.filetypes.any" defines default configurations for any
-- filetype
require("formatter.filetypes.any").remove_trailing_whitespace,
require("formatter.defaults.prettierd")
},
}
opts.filetype = vim.tbl_extend("keep", opts.filetype or {}, filetypes)