Mercurial > vim
view runtime/syntax/vdf.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 | 0827d3d6d8c0 |
children |
line wrap: on
line source
" Vim syntax file " Language: Valve Data Format " Maintainer: ObserverOfTime <chronobserver@disroot.org> " Filenames: *.vdf " Last Change: 2022 Sep 15 if exists('b:current_syntax') finish endif let s:cpo_save = &cpoptions set cpoptions&vim " Comment syn keyword vdfTodo contained TODO FIXME XXX syn match vdfComment +//.*+ contains=vdfTodo " Macro syn match vdfMacro /^\s*#.*/ " Tag syn region vdfTag start=/"/ skip=/\\"/ end=/"/ \ nextgroup=vdfValue skipwhite oneline " Section syn region vdfSection matchgroup=vdfBrace \ start=/{/ end=/}/ transparent fold \ contains=vdfTag,vdfSection,vdfComment,vdfConditional " Conditional syn match vdfConditional /\[\$\w\{1,1021}\]/ nextgroup=vdfTag " Value syn region vdfValue start=/"/ skip=/\\"/ end=/"/ \ oneline contained contains=vdfVariable,vdfNumber,vdfEscape syn region vdfVariable start=/%/ skip=/\\%/ end=/%/ oneline contained syn match vdfEscape /\\[nt\\"]/ contained syn match vdfNumber /"-\?\d\+"/ contained hi def link vdfBrace Delimiter hi def link vdfComment Comment hi def link vdfConditional Constant hi def link vdfEscape SpecialChar hi def link vdfMacro Macro hi def link vdfNumber Number hi def link vdfTag Keyword hi def link vdfTodo Todo hi def link vdfValue String hi def link vdfVariable Identifier let b:current_syntax = 'vdf' let &cpoptions = s:cpo_save unlet s:cpo_save