daniel/dotfiles
1
0
Fork 0
Code Activity Actions

nvim: Fix cmdheight=0 formatting

Browse source
This commit is contained in:
Daniel Kempkens 2022-06-15 15:02:06 +02:00
parent 2cb70224d8
commit 6b305bf9bb
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
config/nvim/nifoc/formatting.fnl
View file

@ -15,6 +15,15 @@
:group augroup :group augroup
:desc "Run Formatter"}))) :desc "Run Formatter"})))
(fn run-neoformat [formatprg]
(let [neoformat (.. "Neoformat " formatprg)
cmdheight (vim.opt.cmdheight:get)]
;; Workaround for a prompt issue with cmdheight=0
(set vim.opt.cmdheight 1)
(cmd (.. "try | undojoin | " neoformat " | catch /E790/ | " neoformat
" | endtry"))
(set vim.opt.cmdheight cmdheight)))
(fn mod.enable-for-buffer [] (fn mod.enable-for-buffer []
(set-bufvar 0 :nifoc_formatter_disabled 0)) (set-bufvar 0 :nifoc_formatter_disabled 0))
@ -38,11 +47,7 @@
formatprg-exe (-> formatprg (vim.split " " {:trimempty true}) (. 1))] formatprg-exe (-> formatprg (vim.split " " {:trimempty true}) (. 1))]
(if (= b.nifoc_formatter_disabled 1) nil (if (= b.nifoc_formatter_disabled 1) nil
(= b.nifoc_lsp_formatter_enabled 1) (vim.lsp.buf.format {:timeout_ms 1000}) (= b.nifoc_lsp_formatter_enabled 1) (vim.lsp.buf.format {:timeout_ms 1000})
(not= formatprg-exe nil) (let [neoformat (.. "Neoformat " (not= formatprg-exe nil) (run-neoformat formatprg-exe))))
formatprg-exe)]
(cmd (.. "try | undojoin | " neoformat
" | catch /E790/ | " neoformat
" | endtry"))))))
mod) mod)