forks/php.vim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge @paulyg commits.

Browse source 
This commit merges parts of:

b9b2b2daaa
e3333be231
This commit is contained in:
Stan Angeloff 2014-01-03 10:50:52 +02:00
parent fc99f30264
commit bbe3272c39
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
syntax/php.template
View file

@ -159,7 +159,7 @@ syn match phpVarSelector "\$" contained display
syn match phpMethodsVar "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble syn match phpMethodsVar "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble
" Identifier " Identifier
syn match phpIdentifier "$\h\w*" contained contains=phpEnvVar,phpIntVar,phpVarSelector display syn match phpIdentifier "$\h\w*" contained contains=phpSuperglobals,phpVarSelector display
syn match phpIdentifierSimply "${\h\w*}" contains=phpOperator,phpParent contained display syn match phpIdentifierSimply "${\h\w*}" contains=phpOperator,phpParent contained display
syn region phpIdentifierComplex matchgroup=phpParent start="{\$"rs=e-1 end="}" contains=phpIdentifier,phpMemberSelector,phpVarSelector,phpIdentifierArray contained extend syn region phpIdentifierComplex matchgroup=phpParent start="{\$"rs=e-1 end="}" contains=phpIdentifier,phpMemberSelector,phpVarSelector,phpIdentifierArray contained extend
syn region phpIdentifierArray matchgroup=phpParent start="\[" end="]" contains=@phpClInside contained syn region phpIdentifierArray matchgroup=phpParent start="\[" end="]" contains=@phpClInside contained
@ -242,7 +242,7 @@ endif
" Parent " Parent
if exists("php_parent_error_close") || exists("php_parent_error_open") if exists("php_parent_error_close") || exists("php_parent_error_open")
syn match phpParent "[{}]" contained syn match phpParent "[{}]" contained
syn region phpParent matchgroup=Delimiter start="(" end=")" contained contains=@phpClInside transparent syn region phpParent matchgroup=Delimiter start="(" end=")" contained contains=@phpClFunction transparent
syn region phpParent matchgroup=Delimiter start="\[" end="\]" contained contains=@phpClInside transparent syn region phpParent matchgroup=Delimiter start="\[" end="\]" contained contains=@phpClInside transparent
if !exists("php_parent_error_close") if !exists("php_parent_error_close")
syn match phpParent "[\])]" contained syn match phpParent "[\])]" contained
@ -306,7 +306,6 @@ endif
if !exists("did_php_syn_inits") if !exists("did_php_syn_inits")
hi def link phpComment Comment hi def link phpComment Comment
hi def link phpSuperglobals Constant
hi def link phpMagicConstants Constant hi def link phpMagicConstants Constant
hi def link phpServerVars Constant hi def link phpServerVars Constant
hi def link phpConstants Constant hi def link phpConstants Constant
@ -333,6 +332,7 @@ if !exists("did_php_syn_inits")
hi def link phpKeyword Keyword hi def link phpKeyword Keyword
hi def link phpFCKeyword Keyword hi def link phpFCKeyword Keyword
hi def link phpSCKeyword Keyword hi def link phpSCKeyword Keyword
hi def link phpSuperglobals Type
hi def link phpType Type hi def link phpType Type
hi def link phpMemberSelector Operator hi def link phpMemberSelector Operator
hi def link phpParent Special hi def link phpParent Special

6
syntax/php.vim
View file

@ -362,7 +362,7 @@ syn match phpVarSelector "\$" contained display
syn match phpMethodsVar "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble syn match phpMethodsVar "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble
" Identifier " Identifier
syn match phpIdentifier "$\h\w*" contained contains=phpEnvVar,phpIntVar,phpVarSelector display syn match phpIdentifier "$\h\w*" contained contains=phpSuperglobals,phpVarSelector display
syn match phpIdentifierSimply "${\h\w*}" contains=phpOperator,phpParent contained display syn match phpIdentifierSimply "${\h\w*}" contains=phpOperator,phpParent contained display
syn region phpIdentifierComplex matchgroup=phpParent start="{\$"rs=e-1 end="}" contains=phpIdentifier,phpMemberSelector,phpVarSelector,phpIdentifierArray contained extend syn region phpIdentifierComplex matchgroup=phpParent start="{\$"rs=e-1 end="}" contains=phpIdentifier,phpMemberSelector,phpVarSelector,phpIdentifierArray contained extend
syn region phpIdentifierArray matchgroup=phpParent start="\[" end="]" contains=@phpClInside contained syn region phpIdentifierArray matchgroup=phpParent start="\[" end="]" contains=@phpClInside contained
@ -445,7 +445,7 @@ endif
" Parent " Parent
if exists("php_parent_error_close") || exists("php_parent_error_open") if exists("php_parent_error_close") || exists("php_parent_error_open")
syn match phpParent "[{}]" contained syn match phpParent "[{}]" contained
syn region phpParent matchgroup=Delimiter start="(" end=")" contained contains=@phpClInside transparent syn region phpParent matchgroup=Delimiter start="(" end=")" contained contains=@phpClFunction transparent
syn region phpParent matchgroup=Delimiter start="\[" end="\]" contained contains=@phpClInside transparent syn region phpParent matchgroup=Delimiter start="\[" end="\]" contained contains=@phpClInside transparent
if !exists("php_parent_error_close") if !exists("php_parent_error_close")
syn match phpParent "[\])]" contained syn match phpParent "[\])]" contained
@ -509,7 +509,6 @@ endif
if !exists("did_php_syn_inits") if !exists("did_php_syn_inits")
hi def link phpComment Comment hi def link phpComment Comment
hi def link phpSuperglobals Constant
hi def link phpMagicConstants Constant hi def link phpMagicConstants Constant
hi def link phpServerVars Constant hi def link phpServerVars Constant
hi def link phpConstants Constant hi def link phpConstants Constant
@ -536,6 +535,7 @@ if !exists("did_php_syn_inits")
hi def link phpKeyword Keyword hi def link phpKeyword Keyword
hi def link phpFCKeyword Keyword hi def link phpFCKeyword Keyword
hi def link phpSCKeyword Keyword hi def link phpSCKeyword Keyword
hi def link phpSuperglobals Type
hi def link phpType Type hi def link phpType Type
hi def link phpMemberSelector Operator hi def link phpMemberSelector Operator
hi def link phpParent Special hi def link phpParent Special