From 432cb47135b0c2d4efbdbf53f3754e3bea5858bb Mon Sep 17 00:00:00 2001 From: Dmytro Meleshko Date: Tue, 25 May 2021 19:09:12 +0300 Subject: [PATCH 1/3] [nvim] use the built-in expansion mechanism in makeprg --- nvim/after/ftplugin/markdown.vim | 8 +------- nvim/after/ftplugin/scss.vim | 8 +------- nvim/plugin/interface.vim | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/nvim/after/ftplugin/markdown.vim b/nvim/after/ftplugin/markdown.vim index f5408c0..94e958b 100644 --- a/nvim/after/ftplugin/markdown.vim +++ b/nvim/after/ftplugin/markdown.vim @@ -1,11 +1,5 @@ source :h/text.vim -let s:src_file = expand('%') -let s:out_file = s:src_file.'.html' -let &l:makeprg = 'markdown2htmldoc' -for s:arg in get(g:, 'dotfiles_markdown2htmldoc_options', []) - let &l:makeprg .= ' '.shellescape(s:arg) -endfor -let &l:makeprg .= ' -- '.shellescape(s:src_file).' '.shellescape(s:out_file) +let &l:makeprg = 'markdown2htmldoc -- %:S %:S.html' nnoremap Open %.html diff --git a/nvim/after/ftplugin/scss.vim b/nvim/after/ftplugin/scss.vim index 9d5f7f1..db198fe 100644 --- a/nvim/after/ftplugin/scss.vim +++ b/nvim/after/ftplugin/scss.vim @@ -1,9 +1,3 @@ source :h/css.vim -let s:src_file = expand('%') -let s:out_file = s:src_file.'.css' -let &l:makeprg = 'sass' -for s:arg in get(g:, 'dotfiles_dart_sass_options', []) - let &l:makeprg .= ' '.shellescape(s:arg) -endfor -let &l:makeprg .= ' -- '.shellescape(s:src_file).':'.shellescape(s:out_file) +let &l:makeprg = 'sass -- %:S:%:S.css' diff --git a/nvim/plugin/interface.vim b/nvim/plugin/interface.vim index 8e357ce..7e38b1d 100644 --- a/nvim/plugin/interface.vim +++ b/nvim/plugin/interface.vim @@ -139,4 +139,4 @@ endif " }}} -nnoremap make +nnoremap make! From a281507269397fbdc7fccb44f2f1763e16ecf2cd Mon Sep 17 00:00:00 2001 From: Dmytro Meleshko Date: Tue, 25 May 2021 19:40:42 +0300 Subject: [PATCH 2/3] [nvim] add a makeprg for awk --- nvim/after/ftplugin/awk.vim | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 nvim/after/ftplugin/awk.vim diff --git a/nvim/after/ftplugin/awk.vim b/nvim/after/ftplugin/awk.vim new file mode 100644 index 0000000..d7574a4 --- /dev/null +++ b/nvim/after/ftplugin/awk.vim @@ -0,0 +1,4 @@ +" +let &l:makeprg = 'awk --lint --source "BEGIN{exit(0)}END{exit(0)}" --file %:S' +" +let &l:errorformat = 'awk: %f:%l: %m' From 7ded7fc2f3e6aec96cfc87d40cd95a5ccb4e3eb1 Mon Sep 17 00:00:00 2001 From: Dmytro Meleshko Date: Tue, 25 May 2021 19:58:01 +0300 Subject: [PATCH 3/3] [nvim] show filename in a confirmation prompt for Bbye --- nvim/plugin/interface.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nvim/plugin/interface.vim b/nvim/plugin/interface.vim index 7e38b1d..975c079 100644 --- a/nvim/plugin/interface.vim +++ b/nvim/plugin/interface.vim @@ -43,7 +43,8 @@ endif function s:CloseBuffer(cmd) abort let cmd = a:cmd if &modified - let answer = confirm("Save changes?", "&Yes\n&No\n&Cancel") + " + let answer = confirm("Save changes to \"".expand('%')."\"?", "&Yes\n&No\n&Cancel") if answer ==# 1 " Yes write elseif answer ==# 2 " No