From: <be...@us...> - 2010-02-14 14:13:41
|
Revision: 2267 http://geshi.svn.sourceforge.net/geshi/?rev=2267&view=rev Author: benbe Date: 2010-02-14 14:13:31 +0000 (Sun, 14 Feb 2010) Log Message: ----------- fix: SF#2818047: Fixed comments now being highlighted properly fix: SF#2818047: Added some more missing keywords fix: SF#2818047: Proposed porting Regexp Detection from Perl to VIM Modified Paths: -------------- trunk/geshi-1.0.X/src/docs/CHANGES trunk/geshi-1.0.X/src/geshi/vim.php Modified: trunk/geshi-1.0.X/src/docs/CHANGES =================================================================== --- trunk/geshi-1.0.X/src/docs/CHANGES 2010-02-14 13:35:17 UTC (rev 2266) +++ trunk/geshi-1.0.X/src/docs/CHANGES 2010-02-14 14:13:31 UTC (rev 2267) @@ -35,6 +35,8 @@ * Added support for ::-style labels as comments (SF#2947393, BenBE) * Removed backslash as Escape Char in T-SQL (SF#2939199, Bruno Braga) * Added Nested Comments Support for Haskell (SF#2922317, BenBE) + * Fixed Comments for VIM, added some keywords, proposed porting of + Regular Expression markup from Perl (SF#2818047, psycojoker, BenBE) Version 1.0.8.6 - Added language files * Clojure (Jess Johnson) Modified: trunk/geshi-1.0.X/src/geshi/vim.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/vim.php 2010-02-14 13:35:17 UTC (rev 2266) +++ trunk/geshi-1.0.X/src/geshi/vim.php 2010-02-14 14:13:31 UTC (rev 2267) @@ -1,5 +1,4 @@ <?php - /************************************************************************************* * vim.php * ---------------- @@ -55,7 +54,9 @@ 'LANG_NAME' => 'Vim Script', 'COMMENT_SINGLE' => array(), 'COMMENT_REGEXP' => array( - 1 => "/^\s*\"[^\"]*?$/m" + 1 => "/\s*\"[^\"]*?$/m", + //Regular expressions (Ported from perl.php) +// 2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU", ), 'COMMENT_MULTI' => array(), 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE, @@ -138,7 +139,7 @@ 'diffopt', 'digraph', 'dip', 'dir', 'directory', 'display', 'dlcomma', 'dy', 'ea', 'ead', 'eadirection', 'eb', 'ed', 'edcompatible', 'ef', 'efm', - 'ei', 'ek', 'enc', 'encoding', 'endofline', + 'ei', 'ek', 'enc', 'encoding', 'endfun', 'endofline', 'eol', 'ep', 'equalalways', 'equalprg', 'errorbells', 'errorfile', 'errorformat', 'esckeys', 'et', 'eventignore', 'ex', 'expandtab', 'exrc', 'fcl', @@ -375,7 +376,8 @@ 0 => 'color: #000000;' ), 'COMMENTS' => array( - 1 => 'color: #adadad; font-style: italic;' + 1 => 'color: #adadad; font-style: italic;', +// 2 => 'color: #009966; font-style: italic;' ), 'ESCAPE_CHAR' => array( 0 => '' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |