Merge pull request syntaxhighlighter#71 from rwstauner/perl-empty-q-ops

Allow perl quote-like operators to be empty
kentaromiura · Mar 18, 2012 · 985329b · 985329b
2 parents 19626a0 + 0e99c88
commit 985329b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/scripts/shBrushPerl.js b/scripts/shBrushPerl.js
@@ -48,11 +48,11 @@
 			{ regex: /-?\w+(?=\s*=(>|&gt;))/g,	css: 'string' }, // fat comma
 
 			// is this too much?
-			{ regex: /\bq[qwxr]?\([\s\S]+?\)/g,	css: 'string' }, // quote-like operators ()
-			{ regex: /\bq[qwxr]?\{[\s\S]+?\}/g,	css: 'string' }, // quote-like operators {}
-			{ regex: /\bq[qwxr]?\[[\s\S]+?\]/g,	css: 'string' }, // quote-like operators []
-			{ regex: /\bq[qwxr]?(<|&lt;)[\s\S]+?(>|&gt;)/g,	css: 'string' }, // quote-like operators <>
-			{ regex: /\bq[qwxr]?([^\w({<[])[\s\S]+?\1/g,	css: 'string' }, // quote-like operators non-paired
+			{ regex: /\bq[qwxr]?\([\s\S]*?\)/g,	css: 'string' }, // quote-like operators ()
+			{ regex: /\bq[qwxr]?\{[\s\S]*?\}/g,	css: 'string' }, // quote-like operators {}
+			{ regex: /\bq[qwxr]?\[[\s\S]*?\]/g,	css: 'string' }, // quote-like operators []
+			{ regex: /\bq[qwxr]?(<|&lt;)[\s\S]*?(>|&gt;)/g,	css: 'string' }, // quote-like operators <>
+			{ regex: /\bq[qwxr]?([^\w({<[])[\s\S]*?\1/g,	css: 'string' }, // quote-like operators non-paired
 
 			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,	css: 'string' },
 			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,	css: 'string' },

diff --git a/tests/brushes/perl.html b/tests/brushes/perl.html
@@ -27,6 +27,7 @@
 
 sub something (;$) { Print @_ } # upper-case P
 *Other::Package::foo = sub { q!bad! };
+my $str = do { my $empty = q{}; $empty .= q'_'; };
 
 print <<HERE;
  doc;