r1216 - in /trunk/packages/vim: debian/changelog runtime/syntax/debcontrol.vim
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Sat Feb 23 00:23:26 UTC 2008
Author: jamessan
Date: Sat Feb 23 00:23:26 2008
New Revision: 1216
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1216
Log:
* runtime/syntax/debcontrol.vim:
- Ignore case for control file keys
- Match case for control file values
- Improve syntax matching for Vcs-Svn, Vcs-Git, and Vcs-Cvs field values.
- Match URLs for Vcs-Arch, Vcs-Bzr, Vcs-Darcs, Vcs-Hg.
- Recognize more fields as multi-line.
- Use the 'keepend' qualifier for the Vcs-* syntax regions to prevent
mishighlighting of debcontrolHTTPUrl matches. (Closes: #466338)
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/runtime/syntax/debcontrol.vim
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1216&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Feb 23 00:23:26 2008
@@ -21,6 +21,14 @@
* Correct a typo in /etc/vim/vimrc's (Closes: #467057) and eval.txt's (via
new last-position-jump.diff patch) 'last-position-jump' code snippet which
would cause it to fail if the g key were remapped.
+ * runtime/syntax/debcontrol.vim:
+ - Ignore case for control file keys
+ - Match case for control file values
+ - Improve syntax matching for Vcs-Svn, Vcs-Git, and Vcs-Cvs field values.
+ - Match URLs for Vcs-Arch, Vcs-Bzr, Vcs-Darcs, Vcs-Hg.
+ - Recognize more fields as multi-line.
+ - Use the 'keepend' qualifier for the Vcs-* syntax regions to prevent
+ mishighlighting of debcontrolHTTPUrl matches. (Closes: #466338)
-- martin f. krafft <madduck at debian.org> Thu, 21 Feb 2008 17:00:37 +0100
Modified: trunk/packages/vim/runtime/syntax/debcontrol.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/runtime/syntax/debcontrol.vim?rev=1216&op=diff
==============================================================================
--- trunk/packages/vim/runtime/syntax/debcontrol.vim (original)
+++ trunk/packages/vim/runtime/syntax/debcontrol.vim Sat Feb 23 00:23:26 2008
@@ -17,6 +17,9 @@
finish
endif
+" Should match case except for the keys of each field
+syn case match
+
" Everything that is not explicitly matched by the rules below
syn match debcontrolElse "^.*$"
@@ -34,13 +37,19 @@
" A URL (using the domain name definitions from RFC 1034 and 1738), right now
" only enforce protocol and some sanity on the server/path part;
-" TODO: debcontrolHTTPUrl somehow is not being matched at all.
-syn match debcontrolUrl contained "\v[+[:alpha:]]+://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-.[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alnum:]]?(:\d+)?(/[^[:space:]]*)?$"
syn match debcontrolHTTPUrl contained "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
+syn match debcontrolVcsSvn contained "\vsvn%(\+https?)?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
+syn match debcontrolVcsCvs contained "\v%(\-d *)?:pserver:[^@]+\@[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?:/[^[:space:]]*%( [^[:space:]]+)?$"
+syn match debcontrolVcsGit contained "\vgit://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
" An email address
syn match debcontrolEmail "[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+"
syn match debcontrolEmail "<.\{-}>"
+
+" #-Comments
+syn match debcontrolComment "^#.*$"
+
+syn case ignore
" List of all legal keys
syn match debcontrolKey contained "^\(Source\|Package\|Section\|Priority\|Maintainer\|Uploaders\|Build-Depends\|Build-Conflicts\|Build-Depends-Indep\|Build-Conflicts-Indep\|Standards-Version\|Pre-Depends\|Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Essential\|Architecture\|Description\|Bugs\|Origin\|Enhances\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|XC-Package-Type\): *"
@@ -51,16 +60,15 @@
syn region debcontrolStrictField start="^Priority" end="$" contains=debcontrolKey,debcontrolPriority oneline
syn region debcontrolStrictField start="^Section" end="$" contains=debcontrolKey,debcontrolSection oneline
syn region debcontrolStrictField start="^XC-Package-Type" end="$" contains=debcontrolKey,debcontrolPackageType oneline
-syn region debcontrolStrictField start="^Homepage" end="$" contains=debcontrolKey,debcontrolHTTPUrl oneline
-syn region debcontrolStrictField start="^\(XS-\)\?Vcs-\(Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)" end="$" contains=debcontrolKey,debcontrolUrl oneline
-syn region debcontrolStrictField start="^\(XS-\)\?Vcs-Browser" end="$" contains=debcontrolKey,debcontrolHTTPUrl oneline
-
-" #-Comments
-syn match debcontrolComment "^#.*$"
+syn region debcontrolStrictField start="^Homepage" end="$" contains=debcontrolKey,debcontrolHTTPUrl oneline keepend
+syn region debcontrolStrictField start="^\%(XS-\)\?Vcs-\%(Browser\|Arch\|Bzr\|Darcs\|Hg\)" end="$" contains=debcontrolKey,debcontrolHTTPUrl oneline keepend
+syn region debcontrolStrictField start="^\%(XS-\)\?Vcs-Svn" end="$" contains=debcontrolKey,debcontrolVcsSvn oneline keepend
+syn region debcontrolStrictField start="^\%(XS-\)\?Vcs-Cvs" end="$" contains=debcontrolKey,debcontrolVcsCvs oneline keepend
+syn region debcontrolStrictField start="^\%(XS-\)\?Vcs-Git" end="$" contains=debcontrolKey,debcontrolVcsGit oneline keepend
" Catch-all for the other legal fields
-syn region debcontrolField start="^\(Maintainer\|Build-Depends\|Build-Conflicts\|Build-Depends-Indep\|Build-Conflicts-Indep\|Standards-Version\|Pre-Depends\|Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Essential\|Bugs\|Origin\|Enhances\|X\(S\|B\)-Python-Version\|XSBC-Original-Maintainer\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
-syn region debcontrolMultiField start="^\(Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ ]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable
+syn region debcontrolField start="^\(Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X\(S\|B\)-Python-Version\|XSBC-Original-Maintainer\|\(XS-\)\?Vcs-Mtn\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
+syn region debcontrolMultiField start="^\(Build-\(Conflicts\|Depends\)\(-Indep\)\=\|\(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ ]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable
" Associate our matches and regions with pretty colours
if version >= 508 || !exists("did_debcontrol_syn_inits")
@@ -82,7 +90,9 @@
HiLink debcontrolPackageType Normal
HiLink debcontrolVariable Identifier
HiLink debcontrolEmail Identifier
- HiLink debcontrolUrl Identifier
+ HiLink debcontrolVcsSvn Identifier
+ HiLink debcontrolVcsCvs Identifier
+ HiLink debcontrolVcsGit Identifier
HiLink debcontrolHTTPUrl Identifier
HiLink debcontrolComment Comment
HiLink debcontrolElse Special
More information about the pkg-vim-maintainers
mailing list