Mercurial > vim
view runtime/ftplugin/mp.vim @ 34682:a36144b38683 v9.1.0222
patch 9.1.0222: missing 'below' virt text if truncation precedes after/right text
Commit: https://github.com/vim/vim/commit/fe0a76b2bca12b13982ad66bafadc0d6c1681d00
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 11:47:32 2024 +0100
patch 9.1.0222: missing 'below' virt text if truncation precedes after/right text
Problem: When a line is truncated just before 'after'/'right' virtual
text and the line also has 'below' virtual text, then the
'below' virtual text would not be displayed, depending on the
order these text properties were added.
Solution: In the loop to make text properties active, skip instead of
break for 'after'/'right' virtual text properties that are
ignored due to truncation, so following 'below' text
properties can still be made active.
Similarly, a loop is needed to determine if a text property
follows at the end of the screen. (Dylan Thacker-Smith)
related: #14307
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:00:04 +0100 |
parents | 8ae680be2a51 |
children |
line wrap: on
line source
vim9script # Vim filetype plugin file # Language: MetaPost # Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com> # Former Maintainers: Nikolai Weibull <now@bitwi.se> # Latest Revision: 2022 Aug 12 # 2024 Jan 14 by Vim Project (browsefilter) if exists("b:did_ftplugin") finish endif b:did_ftplugin = 1 b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<" setlocal comments=:% setlocal commentstring=%\ %s setlocal formatoptions+=cjroql2 setlocal formatoptions-=t setlocal omnifunc=syntaxcomplete#Complete setlocal suffixesadd=.mp,.mpiv,.mpvi,.mpxl &l:include = '\<\%(input\|loadmodule\)\>' # loadmodule is from MetaFun &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+' g:omni_syntax_group_include_mp = 'mf\w\+,mp\w\+,metafun\w\+' g:omni_syntax_group_exclude_mp = 'mfTodoComment' var fignum: number def FixBeginfigs() fignum = 1 g/^\s*beginfig(\d*)\s*;\(\s*%.*\)\=$/s/^.\{-};/\='beginfig(' .. fignum .. ');'/ | ++fignum enddef command! -buffer -nargs=0 -bar FixBeginfigs FixBeginfigs() 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\\|\\)$\\|^mpTeXinsert$"' b:match_words = '\<if\>:\<else\%[if]\>:\<fi\>,' .. '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .. '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .. '\<begin\(\a\+\)\>:end\1,' .. '\<beginlogochar\>:\<endchar\>' b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words b:match_skip" endif if !get(g:, 'no_mp_maps', 0) && !get(g:, 'no_plugin_maps', 0) const mp_regex = { 'beginsection': '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|begin\%(fig\|char\|logochar\|glyph\|graph\)\)\>', 'endsection': '^\s*\%(enddef\|end\%(fig\|char\|glyph\|graph\)\)\>', 'beginblock': '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>', 'endblock': '^\s*\%(endgroup\|fi\|endfor\)\>'} def MoveAround(count: number, what: string, flags: string) search(mp_regex[what], flags .. 's') # 's' sets previous context mark var i = 2 while i <= count search(mp_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 = "MetaPost Source Files (*.mp)\t*.mp\n" if has("win32") b:browsefilter ..= "All Files (*.*)\t*\n" else b:browsefilter ..= "All Files (*)\t*\n" endif b:undo_ftplugin ..= ' | unlet! b:browsefilter' endif # vim: sw=2 fdm=marker