annotate runtime/syntax/editorconfig.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 31b68cad57cc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31671
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1 " Vim syntax file
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2 " Language: EditorConfig
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3 " Maintainer: Gregory Anders <greg@gpanders.com>
32705
31b68cad57cc Highlight editorconfig properties with dashes (#12691)
Christian Brabandt <cb@256bit.org>
parents: 31671
diff changeset
4 " Last Change: 2023-07-20
31671
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
5
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
6 if exists('b:current_syntax')
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
7 finish
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
8 endif
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
9
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
10 runtime! syntax/dosini.vim
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
11 unlet! b:current_syntax
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
12
32705
31b68cad57cc Highlight editorconfig properties with dashes (#12691)
Christian Brabandt <cb@256bit.org>
parents: 31671
diff changeset
13 syntax match editorconfigUnknownProperty "^\s*\zs[a-zA-Z0-9_-]\+\ze\s*="
31671
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
14
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
15 syntax keyword editorconfigProperty root charset end_of_line indent_style
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
16 syntax keyword editorconfigProperty indent_size tab_width max_line_length
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
17 syntax keyword editorconfigProperty trim_trailing_whitespace insert_final_newline
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
18
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
19 hi def link editorconfigProperty dosiniLabel
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
20
5ed19049b1e8 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
21 let b:current_syntax = 'editorconfig'