Skip to content

Commit 9c239a6

Browse files
committed
Replace \@<= backreferences with \zs
1 parent ca1d64a commit 9c239a6

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

syntax/gitcommit.vim

+14-14
Original file line numberDiff line numberDiff line change
@@ -57,37 +57,37 @@ if s:scissors
5757
else
5858
exe 'syn match gitcommitComment "^' . s:comment . '.*"'
5959
endif
60-
exe 'syn match gitcommitTrailers "\n\@<=\n\%([[:alnum:]-]\+\s*:.*\|(cherry picked from commit .*\)\%(\n\s.*\|\n[[:alnum:]-]\+\s*:.*\|\n(cherry picked from commit .*\)*\%(\n\n*\%(' . s:comment . '\)\|\n*\%$\)\@="'
60+
exe 'syn match gitcommitTrailers "\n\zs\n\%([[:alnum:]-]\+\s*:.*\|(cherry picked from commit .*\)\%(\n\s.*\|\n[[:alnum:]-]\+\s*:.*\|\n(cherry picked from commit .*\)*\%(\n\n*\%(' . s:comment . '\)\|\n*\%$\)\@="'
6161

6262
unlet s:l s:comment s:scissors
6363

6464
syn match gitcommitTrailerToken "^[[:alnum:]-]\+\s*:" contained containedin=gitcommitTrailers
6565

6666
syn match gitcommitHash "\<\x\{40,}\>" contains=@NoSpell display
67-
syn match gitcommitOnBranch "\%(^. \)\@<=On branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
68-
syn match gitcommitOnBranch "\%(^. \)\@<=Your branch .\{-\} '" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
67+
syn match gitcommitOnBranch "^. \zsOn branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
68+
syn match gitcommitOnBranch "^. \zsYour branch .\{-\} '" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
6969
syn match gitcommitBranch "[^ ']\+" contained
70-
syn match gitcommitNoBranch "\%(^. \)\@<=Not currently on any branch." contained containedin=gitcommitComment
71-
syn match gitcommitHeader "\%(^. \)\@<=\S.*[::]\%(\n^$\)\@!$" contained containedin=gitcommitComment
72-
syn region gitcommitAuthor matchgroup=gitCommitHeader start=/\%(^. \)\@<=\%(Author\|Committer\|Date\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent
73-
syn match gitcommitHeader "\%(^. \)\@<=commit\%( \x\{40,\}$\)\@=" contained containedin=gitcommitComment nextgroup=gitcommitHash skipwhite
74-
syn match gitcommitNoChanges "\%(^. \)\@<=No changes$" contained containedin=gitcommitComment
70+
syn match gitcommitNoBranch "^. \zsNot currently on any branch." contained containedin=gitcommitComment
71+
syn match gitcommitHeader "^. \zs\S.*[::]\%(\n^$\)\@!$" contained containedin=gitcommitComment
72+
syn region gitcommitAuthor matchgroup=gitCommitHeader start=/%(^. \zs\%(Author\|Committer\|Date\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent
73+
syn match gitcommitHeader "%(^. \zscommit\%( \x\{40,\}$\)\@=" contained containedin=gitcommitComment nextgroup=gitcommitHash skipwhite
74+
syn match gitcommitNoChanges "^. \zsNo changes$" contained containedin=gitcommitComment
7575

76-
syn match gitcommitType "\%(^.\t\)\@<=[^[:punct:][:space:]][^/::]*[^[:punct:][:space:]][::]\ze "he=e-1 contained containedin=gitcommitComment nextgroup=gitcommitFile skipwhite
76+
syn match gitcommitType "^.\t\zs[^[:punct:][:space:]][^/::]*[^[:punct:][:space:]][::]\ze "he=e-1 contained containedin=gitcommitComment nextgroup=gitcommitFile skipwhite
7777
syn match gitcommitFile ".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitArrow
7878
syn match gitcommitArrow " -> " contained nextgroup=gitcommitFile
79-
syn match gitcommitUntrackedFile "\%(^.\t\)\@<=[^::/]*\%(/.*\)\=$" contained containedin=gitcommitComment
79+
syn match gitcommitUntrackedFile "^.\t\zs[^::/]*\%(/.*\)\=$" contained containedin=gitcommitComment
8080

8181
syn region gitcommitUntracked start=/^\z(.\) Untracked files:$/ end=/^\z1\=$\|^\z1\@!/ contains=gitcommitHeader containedin=gitcommitComment containedin=gitcommitComment contained transparent fold
8282
syn region gitcommitDiscarded start=/^\z(.\) Change\%(s not staged for commit\|d but not updated\):$/ end=/^\z1\=$\|^\z1\@!/ contains=gitcommitHeader,gitcommitDiscardedType containedin=gitcommitComment containedin=gitcommitComment contained transparent fold
8383
syn region gitcommitSelected start=/^\z(.\) Changes to be committed:$/ end=/^\z1$\|^\z1\@!/ contains=gitcommitHeader,gitcommitSelectedType containedin=gitcommitComment containedin=gitcommitComment contained transparent fold
8484
syn region gitcommitUnmerged start=/^\z(.\) Unmerged paths:$/ end=/^\z1\=$\|^\z1\@!/ contains=gitcommitHeader,gitcommitUnmergedType containedin=gitcommitComment containedin=gitcommitComment contained transparent fold
8585

86-
syn match gitcommitUntrackedFile "\%(^.\t\)\@<=.*" contained containedin=gitcommitUntracked
86+
syn match gitcommitUntrackedFile "^.\t\zs.*" contained containedin=gitcommitUntracked
8787

88-
syn match gitcommitDiscardedType "\%(^.\t\)\@<=[^[:punct:][:space:]][^/::]*[^[:punct:][:space:]][::]\ze "he=e-1 contained nextgroup=gitcommitDiscardedFile skipwhite
89-
syn match gitcommitSelectedType "\%(^.\t\)\@<=[^[:punct:][:space:]][^/::]*[^[:punct:][:space:]][::]\ze "he=e-1 contained nextgroup=gitcommitSelectedFile skipwhite
90-
syn match gitcommitUnmergedType "\%(^.\t\)\@<=[^[:punct:][:space:]][^/::]*[^[:punct:][:space:]][::]\ze "he=e-1 contained nextgroup=gitcommitUnmergedFile skipwhite
88+
syn match gitcommitDiscardedType "^.\t\zs[^[:punct:][:space:]][^/::]*[^[:punct:][:space:]][::]\ze "he=e-1 contained nextgroup=gitcommitDiscardedFile skipwhite
89+
syn match gitcommitSelectedType "^.\t\zs[^[:punct:][:space:]][^/::]*[^[:punct:][:space:]][::]\ze "he=e-1 contained nextgroup=gitcommitSelectedFile skipwhite
90+
syn match gitcommitUnmergedType "^.\t\zs[^[:punct:][:space:]][^/::]*[^[:punct:][:space:]][::]\ze "he=e-1 contained nextgroup=gitcommitUnmergedFile skipwhite
9191
syn match gitcommitDiscardedFile "\S.\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow
9292
syn match gitcommitSelectedFile "\S.\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
9393
syn match gitcommitUnmergedFile "\S.\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitUnmergedArrow

syntax/gitconfig.vim

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ syn case ignore
1212
syn sync minlines=10
1313

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

0 commit comments

Comments
 (0)