Skip to content

Commit 6032200

Browse files
committed
Replace \@<= backreferences with \zs
1 parent 509e77f commit 6032200

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

syntax/gitcommit.vim

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,25 @@ syn match gitcommitOverflow ".*" contained contains=@Spell
4040
exec 'syn match gitcommitBlank "^[^' . s:comment_char . '].*" contained contains=@Spell'
4141
exec 'syn match gitcommitComment "^[' . s:comment_char . '].*"'
4242
exec 'syn match gitcommitHead "^\%([' . s:comment_char . '] .*\n\)\+[' . s:comment_char . ']$" contained transparent'
43-
exec 'syn match gitcommitOnBranch "\%(^[' . s:comment_char . '] \)\@<=On branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite'
44-
exec 'syn match gitcommitOnBranch "\%(^[' . s:comment_char . '] \)\@<=Your branch .\{-\} ''" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite'
43+
exec 'syn match gitcommitOnBranch "^[' . s:comment_char . '] \zsOn branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite'
44+
exec 'syn match gitcommitOnBranch "^[' . s:comment_char . '] \zsYour branch .\{-\} ''" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite'
4545
syn match gitcommitBranch "[^ ']\+" contained
46-
exec 'syn match gitcommitNoBranch "\%(^[' . s:comment_char . '] \)\@<=Not currently on any branch." contained containedin=gitcommitComment'
47-
exec 'syn match gitcommitHeader "\%(^[' . s:comment_char . '] \)\@<=.*:$" contained containedin=gitcommitComment'
48-
exec 'syn region gitcommitAuthor matchgroup=gitCommitHeader start=/\%(^[' . s:comment_char . '] \)\@<=\%(Author\|Committer\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent'
49-
exec 'syn match gitcommitNoChanges "\%(^[' . s:comment_char . '] \)\@<=No changes$" contained containedin=gitcommitComment'
46+
exec 'syn match gitcommitNoBranch "^[' . s:comment_char . '] \zsNot currently on any branch." contained containedin=gitcommitComment'
47+
exec 'syn match gitcommitHeader "^[' . s:comment_char . '] \zs.*:$" contained containedin=gitcommitComment'
48+
exec 'syn region gitcommitAuthor matchgroup=gitCommitHeader start=/^[' . s:comment_char . '] \zs\%(Author\|Committer\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent'
49+
exec 'syn match gitcommitNoChanges "^[' . s:comment_char . '] \zsNo changes$" contained containedin=gitcommitComment'
5050

5151
exec 'syn region gitcommitUntracked start=/^[' . s:comment_char . '] Untracked files:/ end=/^[' . s:comment_char . ']$\|^[' . s:comment_char . ']\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUntrackedFile fold'
52-
syn match gitcommitUntrackedFile "\t\@<=.*" contained
52+
syn match gitcommitUntrackedFile "\t\zs.*" contained
5353

5454
exec 'syn region gitcommitDiscarded start=/^[' . s:comment_char . '] Change\%(s not staged for commit\|d but not updated\):/ end=/^[' . s:comment_char . ']$\|^[' . s:comment_char . ']\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitDiscardedType fold'
5555
exec 'syn region gitcommitSelected start=/^[' . s:comment_char . '] Changes to be committed:/ end=/^[' . s:comment_char . ']$\|^[' . s:comment_char . ']\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitSelectedType fold'
5656
exec 'syn region gitcommitUnmerged start=/^[' . s:comment_char . '] Unmerged paths:/ end=/^[' . s:comment_char . ']$\|^[' . s:comment_char . ']\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUnmergedType fold'
5757

5858

59-
syn match gitcommitDiscardedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite
60-
syn match gitcommitSelectedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite
61-
syn match gitcommitUnmergedType "\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite
59+
syn match gitcommitDiscardedType "\t\zs[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite
60+
syn match gitcommitSelectedType "\t\zs[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite
61+
syn match gitcommitUnmergedType "\t\zs[[:lower:]][^:]*[[:lower:]]: "he=e-2 contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite
6262
syn match gitcommitDiscardedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow
6363
syn match gitcommitSelectedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
6464
syn match gitcommitUnmergedFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow

syntax/gitconfig.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ syn case ignore
1414
syn sync minlines=10
1515

1616
syn match gitconfigComment "[#;].*"
17-
syn match gitconfigSection "\%(^\s*\)\@<=\[[a-z0-9.-]\+\]"
18-
syn match gitconfigSection '\%(^\s*\)\@<=\[[a-z0-9.-]\+ \+\"\%([^\\"]\|\\.\)*"\]'
19-
syn match gitconfigVariable "\%(^\s*\)\@<=\a\k*\%(\s*\%([=#;]\|$\)\)\@=" nextgroup=gitconfigAssignment skipwhite
17+
syn match gitconfigSection "^\s*\zs\[[a-z0-9.-]\+\]"
18+
syn match gitconfigSection '^\s*\zs\[[a-z0-9.-]\+ \+\"\%([^\\"]\|\\.\)*"\]'
19+
syn match gitconfigVariable "^\s*\zs\a\k*\%(\s*\%([=#;]\|$\)\)\@=" nextgroup=gitconfigAssignment skipwhite
2020
syn region gitconfigAssignment matchgroup=gitconfigNone start=+=\s*+ skip=+\\+ end=+\s*$+ contained contains=gitconfigBoolean,gitconfigNumber,gitConfigString,gitConfigEscape,gitConfigError,gitconfigComment keepend
2121
syn keyword gitconfigBoolean true false yes no contained
2222
syn match gitconfigNumber "\d\+" contained

0 commit comments

Comments
 (0)