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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	syntax/php.template
	syntax/php.vim

Attempted to merge in upstream changes as they claimed to have fixed an issue
that broke spell checking presumably introduced by my branch. I was unable to
get spell checking working with the syntax file that was part of my original
fork: 36ccde5296

Because of this I left my script as is in favor of highlighting just the
@attribute part of the docblock and not highlighting the entire comment string
which appeared visually awkward to me. Ideally I'd love to get spell checking
working in all the places that it should be working but that seems to be a
bigger issue all together.

Also added support for the @usage attribute as it's something that is fairly
common albeit not standard docblocking
This commit is contained in:
Joshua Sherman 2014-01-14 00:23:14 -05:00
commit dfe51a3864
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
syntax/php.template
View file

@ -202,7 +202,7 @@ endif
" Todo " Todo
syn keyword phpTodo todo fixme xxx note contained syn keyword phpTodo todo fixme xxx note contained
syn match phpCommentSelector "\v\@(return|var|param|abstract|access|author|copyright|deprecated|example|global|ignore|internal|link|name|magic|package|see|since|static|staticvar|subpackage|todo|version)" contained syn match phpCommentSelector "\v\@(return|var|param|abstract|access|author|copyright|deprecated|example|global|ignore|internal|link|name|magic|package|see|since|static|staticvar|subpackage|todo|version|usage)" contained
" Comment " Comment
if exists("php_parent_error_open") if exists("php_parent_error_open")

2
syntax/php.vim
View file

@ -525,7 +525,7 @@ endif
" Todo " Todo
syn keyword phpTodo todo fixme xxx note contained syn keyword phpTodo todo fixme xxx note contained
syn match phpCommentSelector "\v\@(return|var|param|abstract|access|author|copyright|deprecated|example|global|ignore|internal|link|name|magic|package|see|since|static|staticvar|subpackage|todo|version)" contained syn match phpCommentSelector "\v\@(return|var|param|abstract|access|author|copyright|deprecated|example|global|ignore|internal|link|name|magic|package|see|since|static|staticvar|subpackage|todo|version|usage)" contained
" Comment " Comment
if exists("php_parent_error_open") if exists("php_parent_error_open")