From a08ed1c36eb8f2a55d925ec741810aedf0ab0e49 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Sun, 26 Dec 2021 21:02:34 +0300 Subject: [PATCH] Install formatter.nvim instead of neoformat --- config/nvim/init.lua | 6 ++---- config/nvim/lua/format.lua | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 config/nvim/lua/format.lua diff --git a/config/nvim/init.lua b/config/nvim/init.lua index b0c5c27..406d14e 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -62,7 +62,7 @@ require("packer").startup(function(use) use({"tpope/vim-fugitive"}) -- Formatter - use({"sbdchd/neoformat"}) + use({"mhartington/formatter.nvim"}) use({"caenrique/nvim-toggle-terminal"}) @@ -109,9 +109,7 @@ autocmd FileType go,lua set noexpandtab vim.g.mapleader = " " -vim.cmd( - [[autocmd BufWritePre *.js,*.jsx,*.ts,*.tsx,*.html,*.css,*.scss,*.json,*.lua,*.svelte silent Neoformat]]) - +require("format") require("lsp") require("nvim-treesitter.configs").setup({ diff --git a/config/nvim/lua/format.lua b/config/nvim/lua/format.lua new file mode 100644 index 0000000..ff9d002 --- /dev/null +++ b/config/nvim/lua/format.lua @@ -0,0 +1,33 @@ +local function prettierd() + return { + exe = "prettierd", + args = {vim.api.nvim_buf_get_name(0)}, + stdin = true + } +end + +local function luaformat() + return { + exe = "lua-format", + args = {vim.api.nvim_buf_get_name(0)}, + stdin = true + } +end + +require("formatter").setup({ + filetype = { + javascript = {prettierd}, + javascriptreact = {prettierd}, + typescript = {prettierd}, + typescriptreact = {prettierd}, + html = {prettierd}, + css = {prettierd}, + scss = {prettierd}, + json = {prettierd}, + svelte = {prettierd}, + lua = {luaformat} + } +}) + +vim.cmd( + [[autocmd BufWritePost *.js,*.jsx,*.ts,*.tsx,*.html,*.css,*.scss,*.json,*.svelte,*.lua FormatWrite]])