From 0bdaea84f64ad44643a070872af47503de4686c7 Mon Sep 17 00:00:00 2001
From: Joseph Pecoraro <joepeck02@gmail.com>
Date: Wed, 2 Jul 2008 12:36:52 -0400
Subject: [PATCH] Merging in the regex fixes from Joseph Pecoraro as seen here:
 http://lists.macromates.com/textmate/2008-June/025973.html

---
 Syntaxes/JavaScript Basic.tmLanguage | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Syntaxes/JavaScript Basic.tmLanguage b/Syntaxes/JavaScript Basic.tmLanguage
index c8e67f0..1d9ac7d 100644
--- a/Syntaxes/JavaScript Basic.tmLanguage	
+++ b/Syntaxes/JavaScript Basic.tmLanguage	
@@ -586,7 +586,7 @@
 		<dict>
 			<key>begin</key>
 			<string>(?x)
-				(?&lt;= [=(:] | ^ | return )
+				(?&lt;= [\[,=(:] | ^ | &amp;&amp; | return )
 				\s*((/)) (?! [/*+{}?] | $ )</string>
 			<key>beginCaptures</key>
 			<dict>
@@ -641,7 +641,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>,[ |\t]*</string>
+			<string>,</string>
 			<key>name</key>
 			<string>meta.delimiter.object.comma.js</string>
 		</dict>