From 45af33ff745f0fff6463ff238c49f4132641c5fe Mon Sep 17 00:00:00 2001 From: Joshua Sherman Date: Mon, 6 Jan 2014 09:35:58 -0500 Subject: [PATCH] Added Static class and docblock highlighting This is actually a rework of the patch @kris89 sent in that adds the syntax to the php.template file so they won't be lost when regenerating the php.vim file. Thanks @kris89 !! --- syntax/php.template | 7 +++++-- syntax/php.vim | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/syntax/php.template b/syntax/php.template index ccac528..458b754 100644 --- a/syntax/php.template +++ b/syntax/php.template @@ -157,6 +157,7 @@ syn match phpMemberSelector "->" contained display syn match phpVarSelector "\$" contained display " highlight object variables inside strings syn match phpMethodsVar "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble +syn match phpClasses "\v[A-Za-z]+(::)@=" contained display " Identifier syn match phpIdentifier "$\h\w*" contained contains=phpSuperglobals,phpVarSelector display @@ -198,12 +199,13 @@ endif " Todo syn keyword phpTodo todo fixme xxx note contained +syn match phpCommentSelector "\v\@(return|var|param)" contained " Comment if exists("php_parent_error_open") - syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,@Spell + syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,phpCommentSelector,@Spell else - syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,@Spell extend + syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,phpCommentSelector,@Spell extend endif syn match phpCommentStar contained "^\s*\*[^/]"me=e-1 @@ -350,6 +352,7 @@ if !exists("did_php_syn_inits") hi def link phpStructure Statement hi def link phpOperator Operator hi def link phpVarSelector Operator + hi def link phpCommentSelector PreProc hi def link phpInclude PreProc hi def link phpDefine PreProc hi def link phpKeyword Keyword diff --git a/syntax/php.vim b/syntax/php.vim index a2c7d5f..57dc843 100644 --- a/syntax/php.vim +++ b/syntax/php.vim @@ -384,6 +384,7 @@ syn match phpMemberSelector "->" contained display syn match phpVarSelector "\$" contained display " highlight object variables inside strings syn match phpMethodsVar "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble +syn match phpClasses "\v[A-Za-z]+(::)@=" contained display " Identifier syn match phpIdentifier "$\h\w*" contained contains=phpSuperglobals,phpVarSelector display @@ -425,12 +426,13 @@ endif " Todo syn keyword phpTodo todo fixme xxx note contained +syn match phpCommentSelector "\v\@(return|var|param)" contained " Comment if exists("php_parent_error_open") - syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,@Spell + syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,phpCommentSelector,@Spell else - syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,@Spell extend + syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,phpCommentSelector,@Spell extend endif syn match phpCommentStar contained "^\s*\*[^/]"me=e-1 @@ -577,6 +579,7 @@ if !exists("did_php_syn_inits") hi def link phpStructure Statement hi def link phpOperator Operator hi def link phpVarSelector Operator + hi def link phpCommentSelector PreProc hi def link phpInclude PreProc hi def link phpDefine PreProc hi def link phpKeyword Keyword