Mercurial > vim
view runtime/syntax/scdoc.vim @ 34536:ad6cd802579d v9.1.0170
patch 9.1.0170: Re-allow curwin == prevwin, but document it instead
Commit: https://github.com/vim/vim/commit/d64801e913314d2e19dbb38f60e6d285238debff
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Mar 12 20:46:12 2024 +0100
patch 9.1.0170: Re-allow curwin == prevwin, but document it instead
Problem: more places exist where curwin == prevwin, and it may even be
expected in some cases.
Solution: revert v9.1.0001, but document that it's possible instead.
(Sean Dewar)
I've had a change of heart for the following reasons:
- A quick 'n dirty [GitHub code
search](https://github.com/search?q=%2F%28winnr%5C%28%5C%29%5Cs*%3D%3D%5Cs*winnr%5C%28%5B%27%22%5D%23%5B%27%22%5D%5C%29%7Cwinnr%5C%28%5B%27%22%5D%23%5B%27%22%5D%5C%29%5Cs*%3D%3D%5Cs*winnr%5C%28%5C%29%29%2F&type=code)
reveals some cases where it's expected in the wild.
Particularly, it made me aware `winnr() == winnr('#')` is possible when curwin
is changed temporarily during the evaluation of a &statusline expression item
(`%{...}`), and is used to show something different on the statusline
belonging to the previous window; that behaviour wasn't changed in v9.1.0001,
but it means curwin == prevwin makes sense in some cases.
- The definition and call sites of back_to_prevwin imply some expectation that
prevwin == wp (== curwin) is possible, as it's used to skip entering the
prevwin in that case.
- Prior to v9.1.0001, `:wincmd p` would not beep in the case that was patched in
v9.1.0001, but now does. That resulted in #14047 being opened, as it affected
the CtrlP plugin.
I find it odd that `:wincmd p` had cases where it wouldn't beep despite doing
nothing, but it may be preferable to keep things that way (or instead also
beep if curwin == prevwin, if that's preferred).
- After more digging, I found cases in win_free_mem, enter_tabpage,
aucmd_restbuf and qf_open_new_cwindow where curwin == prevwin is possible
(many of them from autocommands). Others probably exist too, especially in
places where curwin is changed temporarily.
fixes: #14047
closes: #14186
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 12 Mar 2024 21:00:11 +0100 |
parents | cd68a630f0d0 |
children |
line wrap: on
line source
" Syntax file for scdoc files " Maintainer: Gregory Anders <contact@gpanders.com> " Last Updated: 2022-05-09 " Upstream: https://github.com/gpanders/vim-scdoc if exists('b:current_syntax') finish endif let b:current_syntax = 'scdoc' syntax match scdocFirstLineError "\%^.*$" syntax match scdocFirstLineValid "\%^\S\+(\d[0-9A-Za-z]*)\%(\s\+\"[^"]*\"\%(\s\+\"[^"]*\"\)\=\)\=$" syntax region scdocCommentError start="^;\S" end="$" keepend syntax region scdocComment start="^; " end="$" keepend syntax region scdocHeaderError start="^#\{3,}" end="$" keepend syntax region scdocHeader start="^#\{1,2}" end="$" keepend syntax match scdocIndentError "^[ ]\+" syntax match scdocLineBreak "++$" syntax region scdocOrderedListItem matchgroup=scdocOrderedListMarker start="^\z(\s*\)\." skip="^\z1 .*$" end="^" contains=scdocBold,scdocUnderline syntax region scdocListItem matchgroup=scdocListMarker start="^\z(\s*\)-" skip="^\z1 .*$" end="^" contains=scdocBold,scdocUnderline " Tables cannot start with a column syntax match scdocTableError "^:" syntax region scdocTable matchgroup=scdocTableEntry start="^[\[|\]][\[\-\]<=>]" end="^$" contains=scdocTableEntry,scdocTableError,scdocTableContinuation,scdocBold,scdocUnderline,scdocPre syntax match scdocTableError "^.*$" contained syntax match scdocTableContinuation "^ \+\S\+" contained syntax match scdocTableEntry "^[|:][\[\-\]<=> ]" contained syntax match scdocTableError "^[|:][\[\-\]<=> ]\S.*$" contained syntax region scdocBold concealends matchgroup=scdocBoldDelimiter start="\\\@<!\*" end="\\\@<!\*" syntax region scdocUnderline concealends matchgroup=scdocUnderlineDelimiter start="\<\\\@<!_" end="\\\@<!_\>" syntax region scdocPre matchgroup=scdocPreDelimiter start="^\t*```" end="^\t*```" syntax sync minlines=50 hi default link scdocFirstLineValid Comment hi default link scdocComment Comment hi default link scdocHeader Title hi default link scdocOrderedListMarker Statement hi default link scdocListMarker scdocOrderedListMarker hi default link scdocLineBreak Special hi default link scdocTableSpecifier Statement hi default link scdocTableEntry Statement hi default link scdocFirstLineError Error hi default link scdocCommentError Error hi default link scdocHeaderError Error hi default link scdocIndentError Error hi default link scdocTableError Error hi default link scdocTableError Error hi default link scdocPreDelimiter Delimiter hi default scdocBold term=bold cterm=bold gui=bold hi default scdocUnderline term=underline cterm=underline gui=underline hi default link scdocBoldDelimiter scdocBold hi default link scdocUnderlineDelimiter scdocUnderline