Mercurial > vim
diff runtime/ftplugin/mf.vim @ 29756:2acb87ee55fc
Update runtime files
Commit: https://github.com/vim/vim/commit/e1f3fd1d02e3f5fe6d2b6d82687c6846b8e500f8
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 15 18:51:32 2022 +0100
Update runtime files
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 15 Aug 2022 20:00:05 +0200 |
parents | bdd7fc1a38c0 |
children | 8ae680be2a51 |
line wrap: on
line diff
--- a/runtime/ftplugin/mf.vim +++ b/runtime/ftplugin/mf.vim @@ -1,70 +1,82 @@ -" Vim filetype plugin file -" Language: METAFONT -" Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com> -" Former Maintainers: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2016 Oct 2 +vim9script + +# Vim filetype plugin file +# Language: METAFONT +# Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com> +# Former Maintainers: Nikolai Weibull <now@bitwi.se> +# Latest Revision: 2022 Aug 12 if exists("b:did_ftplugin") finish endif -let b:did_ftplugin = 1 -let s:cpo_save = &cpo -set cpo&vim +b:did_ftplugin = 1 +b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<" -let b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<" - \ . "| unlet! b:match_ignorecase b:match_words b:match_skip" - -setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=cjroql2 +setlocal comments=:% +setlocal commentstring=%\ %s +setlocal formatoptions+=cjroql2 +setlocal formatoptions-=t +setlocal omnifunc=syntaxcomplete#Complete setlocal suffixesadd=.mf -let &l:include = '\<input\>' -let &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+' -setlocal omnifunc=syntaxcomplete#Complete -let g:omni_syntax_group_include_mf = 'mf\w\+' -let g:omni_syntax_group_exclude_mf = 'mfTodoComment' - -let s:mp_regex = { - \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|beginchar\|beginlogochar\)\>', - \ 'endsection' : '^\s*\%(enddef\|endchar\)\>', - \ 'beginblock' : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>', - \ 'endblock' : '^\s*\%(endgroup\|fi\|endfor\)\>' - \ } -function! s:move_around(count, what, flags, visual) - if a:visual - exe "normal! gv" - endif - call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark - call map(range(2, a:count), 'search(s:mp_regex[a:what], a:flags)') -endfunction +&l:include = '\<input\>' +&l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+' +g:omni_syntax_group_include_mf = 'mf\w\+' +g:omni_syntax_group_exclude_mf = 'mfTodoComment' -" Move around macros. -nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR> -vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true) <CR> -nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W", v:false) <CR> -vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W", v:true) <CR> -nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection", "bW", v:false) <CR> -vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection", "bW", v:true) <CR> -nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection", "W", v:false) <CR> -vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection", "W", v:true) <CR> -nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock", "bW", v:false) <CR> -vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock", "bW", v:true) <CR> -nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock", "W", v:false) <CR> -vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock", "W", v:true) <CR> - -if exists("loaded_matchit") - let b:match_ignorecase = 0 - let b:match_words = - \ '\<if\>:\<else\%[if]\>:\<fi\>,' . - \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' . - \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' . - \ '\<begingroup\>:\<endgroup\>,' . - \ '\<begin\%(logo\)\?char\>:\<endchar\>' - " Ignore comments and strings - let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name") - \ =~# "mf\\(Comment\\|String\\)$"' +if exists("g:loaded_matchit") && !exists("b:match_words") + b:match_ignorecase = 0 + b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name") =~# "mf\\(Comment\\|String\\)$"' + b:match_words = '\<if\>:\<else\%[if]\>:\<fi\>,' + .. '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' + .. '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' + .. '\<begingroup\>:\<endgroup\>,' + .. '\<begin\%(logo\)\?char\>:\<endchar\>' + b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words b:match_skip" endif -let &cpo = s:cpo_save -unlet s:cpo_save +if !get(g:, 'no_mf_maps', 0) && !get(g:, 'no_plugin_maps', 0) + const mf_regex = { + 'beginsection': '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|beginchar\|beginlogochar\)\>', + 'endsection': '^\s*\%(enddef\|endchar\)\>', + 'beginblock': '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>', + 'endblock': '^\s*\%(endgroup\|fi\|endfor\)\>'} + + def MoveAround(count: number, what: string, flags: string) + search(mf_regex[what], flags .. 's') # 's' sets previous context mark + var i = 2 + while i <= count + search(mf_regex[what], flags) + i += 1 + endwhile + enddef + + # Macros to move around + nnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr> + vnoremap <silent><buffer> [[ <scriptcmd>MoveAround(v:count1, "beginsection", "bW")<cr> + nnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr> + vnoremap <silent><buffer> ]] <scriptcmd>MoveAround(v:count1, "beginsection", "W") <cr> + nnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection", "bW")<cr> + vnoremap <silent><buffer> [] <scriptcmd>MoveAround(v:count1, "endsection", "bW")<cr> + nnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection", "W") <cr> + vnoremap <silent><buffer> ][ <scriptcmd>MoveAround(v:count1, "endsection", "W") <cr> + nnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock", "bW")<cr> + vnoremap <silent><buffer> [{ <scriptcmd>MoveAround(v:count1, "beginblock", "bW")<cr> + nnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock", "W") <cr> + vnoremap <silent><buffer> ]} <scriptcmd>MoveAround(v:count1, "endblock", "W") <cr> + + for mapping in ["[[", "]]", "[]", "][", "[{", "]}"] + b:undo_ftplugin ..= printf(" | silent! execute 'nunmap <buffer> %s'", mapping) + b:undo_ftplugin ..= printf(" | silent! execute 'vunmap <buffer> %s'", mapping) + endfor +endif + +if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter') + b:browsefilter = "METAFONT Source Files (*.mf)\t*.mf\n" + .. "All Files (*.*)\t*.*\n" + b:undo_ftplugin ..= ' | unlet! b:browsefilter' +endif + +# vim: sw=2 fdm=marker