Skip to content

Commit 4f68225

Browse files
StanAngeloffStanAngeloff
committed
Merge branch 'adriaanzon/master'
2 parents 0447f77 + 91a9935 commit 4f68225

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

‎syntax/php.vim‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ syn match phpVarSelector "\$" contained display
538538
" highlight static and object variables inside strings
539539
syn match phpMethodsVar "\%(->\|::$\?\)\h\w*" contained contains=phpMethods,phpMemberSelector,phpIdentifier display containedin=phpStringDouble
540540
syn match phpMethodsVar "\%(->\|::\%($\)\@!\)\s*\h\w*\s*("me=e-1 skipwhite skipempty contained contains=phpMemberSelector,phpMethod display containedin=phpStringDouble
541-
syn match phpMethod /\h\w*/
541+
syn match phpMethod /\h\w*/ contained
542542
syn match phpSplatOperator "\.\.\." contained display
543543

544544
" Identifier
@@ -601,9 +601,9 @@ if !exists("php_ignore_phpdoc") || !php_ignore_phpdoc
601601
syn region phpCommentTitle contained matchgroup=phpDocComment start="/\*\*" matchgroup=phpCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=phpCommentStar,phpTodo,phpDocTags,@Spell containedin=phpDocComment
602602

603603
syn region phpDocTags start="{@\(example\|id\|internal\|inheritdoc\|link\|source\|toc\|tutorial\)" end="}" containedin=phpDocComment
604-
syn match phpDocTags "@\%(abstract\|access\|api\|author\|brief\|bug\|category\|class\|copyright\|created\|date\|deprecated\|details\|example\|exception\|file\|filesource\|final\|global\|id\|ignore\|inheritdoc\|internal\|license\|link\|magic\|method\|name\|package\|param\|property\|return\|see\|since\|source\|static\|staticvar\|struct\|subpackage\|throws\|toc\|todo\|tutorial\|type\|uses\|var\|version\|warning\)" containedin=phpDocComment nextgroup=phpDocParam,phpDocIdentifier skipwhite
605-
syn match phpDocParam "\s\+\zs\%(\h\w*|\?\)\+" nextgroup=phpDocIdentifier skipwhite
606-
syn match phpDocIdentifier "\s\+\zs$\h\w*"
604+
syn match phpDocTags "@\%(abstract\|access\|api\|author\|brief\|bug\|category\|class\|copyright\|created\|date\|deprecated\|details\|example\|exception\|file\|filesource\|final\|global\|id\|ignore\|inheritdoc\|internal\|license\|link\|magic\|method\|name\|package\|param\|property\|return\|see\|since\|source\|static\|staticvar\|struct\|subpackage\|throws\|toc\|todo\|tutorial\|type\|uses\|var\|version\|warning\)" containedin=phpDocComment nextgroup=phpDocParam,phpDocIdentifier skipwhite contained
605+
syn match phpDocParam "\s\+\zs\%(\h\w*|\?\)\+" nextgroup=phpDocIdentifier skipwhite contained
606+
syn match phpDocIdentifier "\s\+\zs$\h\w*" contained
607607

608608
syn case match
609609
endif
@@ -666,12 +666,12 @@ syn match phpStaticClasses "\v\h\w+(::)@=" contained display
666666
" Class name
667667
syn keyword phpKeyword class contained
668668
\ nextgroup=phpClass skipwhite skipempty
669-
syn match phpClass /\h\w*/
669+
syn match phpClass /\h\w*/ contained
670670

671671
" Class extends
672672
syn keyword phpKeyword extends contained
673673
\ nextgroup=phpClassExtends skipwhite skipempty
674-
syn match phpClassExtends /\(\\\|\h\w*\)*\h\w*/
674+
syn match phpClassExtends /\(\\\|\h\w*\)*\h\w*/ contained
675675

676676
" Class implements
677677
syntax keyword phpKeyword implements contained
@@ -694,7 +694,7 @@ syn match phpUseKeyword /\(function\|as\)\_s\+/ contained contains=phpKeyword
694694
" Function name
695695
syn keyword phpKeyword function contained
696696
\ nextgroup=phpFunction skipwhite skipempty
697-
syn match phpFunction /\h\w*/
697+
syn match phpFunction /\h\w*/ contained
698698

699699
" Clusters
700700
syn cluster phpClConst contains=phpFunctions,phpClasses,phpStaticClasses,phpIdentifier,phpStatement,phpKeyword,phpOperator,phpSplatOperator,phpStringSingle,phpStringDouble,phpBacktick,phpNumber,phpType,phpBoolean,phpStructure,phpMethodsVar,phpConstants,phpException,phpSuperglobals,phpMagicConstants,phpServerVars
@@ -741,7 +741,7 @@ if php_folding==1
741741

742742
syn region phpFoldIfContainer start="^\z(\s*\)if\s\+\(.*{$\)\@=" skip="^\z1}\_s*else\%[if]" end="^\z1}$" keepend extend contained contains=@phpClFunction,@phpClControl,phpFCKeyword,phpFoldHtmlInside
743743
syn region phpFoldIf matchgroup=phpKeyword start="^\z(\s*\)if\s\+\([^}]*$\)\@=" matchgroup=Delimiter end="\(^\z1\)\@=}\(\_s\+\%[elseif]\s\+[^}]*$\)\@="me=s-1 contained containedin=phpFoldIfContainer keepend nextgroup=phpFoldElseIf,phpFoldElse fold transparent
744-
syn region phpFoldElseIf matchgroup=phpKeyword start="^\z(\s*\)\(}\s\+\)\=elseif\s\+\([^}]*$\)\@=" matchgroup=Delimiter end="\(^\z1\)\@=}\(\s*\%[elseif]\s*[^}]*$\)\@="me=s-1 contained containedin=phpFoldIfContainer keepend nextgroup=phpFoldElseIf,phpFoldElse fold transparent
744+
syn region phpFoldElseIf matchgroup=phpKeyword start="^\z(\s*\)\(}\s\+\)\=elseif\s\+\([^}]*$\)\@=" matchgroup=Delimiter end="\(^\z1\)\@=}\(\s*\%[elseif]\s*[^}]*$\)\@="me=s-1 contained containedin=phpFoldIfContainer keepend nextgroup=phpFoldElseIf,phpFoldElse fold transparent
745745
syn region phpFoldElse matchgroup=phpKeyword start="^\z(\s*\)\(}\s\+\)\=else\s\+\([^}]*$\)\@=" matchgroup=Delimiter end="\(^\z1\)\@=}\(\s\+\%[elseif]\s\+[^}]*$\)\@="me=s-1 contained containedin=phpFoldIfContainer keepend fold transparent
746746

747747
syn region phpFoldSwitch matchgroup=phpKeyword start="^\z(\s*\)switch\s*\(.*{$\)\@=" matchgroup=Delimiter end="^\z1}$" keepend extend contained contains=@phpClFunction,@phpClControl,phpFCKeyword,phpFoldHtmlInside fold transparent

0 commit comments

Comments
 (0)