Mercurial > vim
view runtime/syntax/gitolite.vim @ 34538:c865c2f93a04 v9.1.0171
patch 9.1.0171: Small split-move related improvements
Commit: https://github.com/vim/vim/commit/5cac1a9bee0798d70a7fd80363a1f697759638e8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Mar 12 21:11:39 2024 +0100
patch 9.1.0171: Small split-move related improvements
Problem: small improvements can be made to split-move related
functions.
Solution: apply them (Sean Dewar):
- Improve some doc comments (frame_flatten should still work for non-current
tabpages, despite the topframe check, which looks benign, though I'm unsure if
it's still needed; see #2467).
- f_win_splitmove should check_split_disallowed on wp, not targetwin, as that's
what win_splitmove checks (though it's probably unnecessary to check
b_locked_split at all; see #14109, which I hope to get around to finishing at
some point).
- Make winframe_restore restore window positions for the altframe, which
winframe_remove changes. This doesn't affect the prior behaviour, as we called
win_comp_pos after, but as win_comp_pos only works for curtab, and
winframe_remove supports non-current tabpages, we should undo it. Regardless,
this should mean we don't need win_comp_pos anymore; adjust tests to check
that window positions remain unchanged.
I'm not sure win_comp_pos is needed after last_status anyway if it doesn't
steal rows from another frame to make room for a new statusline, which
shouldn't be the case after winframe_remove? To be safe, I'll leave it as is.
closes: #14185
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:15:03 +0100 |
parents | 3b26420fc639 |
children |
line wrap: on
line source
" Vim syntax file " Language: gitolite configuration " URL: https://github.com/sitaramc/gitolite/blob/master/contrib/vim/syntax/gitolite.vim " (https://raw.githubusercontent.com/sitaramc/gitolite/master/contrib/vim/syntax/gitolite.vim) " Maintainer: Sitaram Chamarty <sitaramc@gmail.com> " (former Maintainer: Teemu Matilainen <teemu.matilainen@iki.fi>) " Last Change: 2017 Oct 05 if exists("b:current_syntax") finish endif let s:cpo_save = &cpo set cpo&vim " this seems to be the best way, for now. syntax sync fromstart " ---- common stuff syn match gitoliteGroup '@\S\+' syn match gitoliteComment '#.*' contains=gitoliteTodo syn keyword gitoliteTodo TODO FIXME XXX NOT contained " ---- main section " catch template-data syntax appearing outside template-data section syn match gitoliteRepoError '^\s*repo.*=' syn match gitoliteRepoError '^\s*\S\+\s*=' " this gets overridden later when first word is a perm, don't worry " normal gitolite group and repo lines syn match gitoliteGroupLine '^\s*@\S\+\s*=\s*\S.*$' contains=gitoliteGroup,gitoliteComment syn match gitoliteRepoLine '^\s*repo\s\+[^=]*$' contains=gitoliteRepo,gitoliteGroup,gitoliteComment syn keyword gitoliteRepo repo contained syn keyword gitoliteSpecialRepo CREATOR " normal gitolite rule lines syn match gitoliteRuleLine '^\s*\(-\|C\|R\|RW+\?C\?D\?\)\s[^#]*' contains=gitoliteRule,gitoliteCreateRule,gitoliteDenyRule,gitoliteRefex,gitoliteUsers,gitoliteGroup syn match gitoliteRule '\(^\s*\)\@<=\(-\|C\|R\|RW+\?C\?D\?\)\s\@=' contained syn match gitoliteRefex '\(^\s*\(-\|R\|RW+\?C\?D\?\)\s\+\)\@<=\S.\{-}\(\s*=\)\@=' contains=gitoliteSpecialRefex syn match gitoliteSpecialRefex 'NAME/' syn match gitoliteSpecialRefex '/USER/' syn match gitoliteCreateRule '\(^\s*C\s.*=\s*\)\@<=\S[^#]*[^# ]' contained contains=gitoliteGroup syn match gitoliteDenyRule '\(^\s*-\s.*=\s*\)\@<=\S[^#]*[^# ]' contained " normal gitolite config (and similar) lines syn match gitoliteConfigLine '^\s*\(config\|option\|include\|subconf\)\s[^#]*' contains=gitoliteConfigKW,gitoliteConfigKey,gitoliteConfigVal,gitoliteComment syn keyword gitoliteConfigKW config option include subconf contained syn match gitoliteConfigKey '\(\(config\|option\)\s\+\)\@<=[^ =]*' contained syn match gitoliteConfigVal '\(=\s*\)\@<=\S.*' contained " ---- template-data section syn region gitoliteTemplateLine matchgroup=PreProc start='^=begin template-data$' end='^=end$' contains=gitoliteTplRepoLine,gitoliteTplRoleLine,gitoliteGroup,gitoliteComment,gitoliteTplError syn match gitoliteTplRepoLine '^\s*repo\s\+\S.*=.*' contained contains=gitoliteTplRepo,gitoliteTplTemplates,gitoliteGroup syn keyword gitoliteTplRepo repo contained syn match gitoliteTplTemplates '\(=\s*\)\@<=\S.*' contained contains=gitoliteGroup,gitoliteComment syn match gitoliteTplRoleLine '^\s*\S\+\s*=\s*.*' contained contains=gitoliteTplRole,gitoliteGroup,gitoliteComment syn match gitoliteTplRole '\S\+\s*='he=e-1 contained " catch normal gitolite rules appearing in template-data section syn match gitoliteTplError '^\s*repo[^=]*$' contained syn match gitoliteTplError '^\s*\(-\|R\|RW+\?C\?D\?\)\s'he=e-1 contained syn match gitoliteTplError '^\s*\(config\|option\|include\|subconf\)\s'he=e-1 contained syn match gitoliteTplError '^\s*@\S\+\s*=' contained contains=NONE hi def link gitoliteGroup Identifier hi def link gitoliteComment Comment hi def link gitoliteTodo ToDo hi def link gitoliteRepoError Error hi def link gitoliteGroupLine PreProc hi def link gitoliteRepo Keyword hi def link gitoliteSpecialRepo PreProc hi def link gitoliteRule Keyword hi def link gitoliteCreateRule PreProc hi def link gitoliteDenyRule WarningMsg hi def link gitoliteRefex Constant hi def link gitoliteSpecialRefex PreProc hi def link gitoliteConfigKW Keyword hi def link gitoliteConfigKey Identifier hi def link gitoliteConfigVal String hi def link gitoliteTplRepo Keyword hi def link gitoliteTplTemplates Constant hi def link gitoliteTplRole Constant hi def link gitoliteTplError Error let b:current_syntax = "gitolite" let &cpo = s:cpo_save unlet s:cpo_save