From 4d363e463d0e45052ec44ff631bc8c66d7a6734e Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Thu, 30 Sep 2021 14:25:43 +1000 Subject: syntax-highlighting: vim: improve the ftplugin Add 'formatoptions' to improve comment formatting. Set b:match_words. See :help matchit Set b:browsefilter. See :help browsefilter Add 'expandtab' from the style guide and a meson_recommended_style config variable to allow users to disable style-related settings. This is a defacto standard feature for ftplugins. --- data/syntax-highlighting/vim/ftplugin/meson.vim | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/syntax-highlighting/vim/ftplugin/meson.vim b/data/syntax-highlighting/vim/ftplugin/meson.vim index 106451997..1ce9a0303 100644 --- a/data/syntax-highlighting/vim/ftplugin/meson.vim +++ b/data/syntax-highlighting/vim/ftplugin/meson.vim @@ -12,11 +12,28 @@ set cpo&vim setlocal commentstring=#\ %s setlocal comments=:# +setlocal formatoptions+=croql formatoptions-=t -setlocal shiftwidth=2 -setlocal softtabstop=2 +let b:undo_ftplugin = "setl com< cms< fo<" -let b:undo_ftplugin = "setl com< cms< sts< sw<" +if get(g:, "meson_recommended_style", 1) + setlocal expandtab + setlocal shiftwidth=2 + setlocal softtabstop=2 + let b:undo_ftplugin .= " | setl et< sts< sw<" +endif + +if exists("loaded_matchit") && !exists("b:match_words") + let b:match_words = '\:\:\:\,' . + \ '\:\:\:\' + let b:undo_ftplugin .= " | unlet! b:match_words" +endif + +if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") + let b:browsefilter = "Meson Build Files (meson.build)\tmeson.build\n" . + \ "All Files (*.*)\t*.*\n" + let b:undo_ftplugin .= " | unlet! b:browsefilter" +endif let &cpo = s:keepcpo unlet s:keepcpo -- cgit v1.2.3