From efa328fc9321f7501dac2dd261fba0e50bff2aeb Mon Sep 17 00:00:00 2001
From: subtlegradient <subtlegradient@dfb7d73b-c2ec-0310-8fea-fb051d288c6d>
Date: Wed, 2 Jul 2008 17:01:10 +0000
Subject: [PATCH] Improved meta.function.json.js with punctuation and proper
 storage.type

git-svn-id: http://macromates.com/svn/Bundles/trunk/Review/Bundles/JavaScript.tmbundle@10105 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
---
 Syntaxes/JavaScript Basic.tmLanguage | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/Syntaxes/JavaScript Basic.tmLanguage b/Syntaxes/JavaScript Basic.tmLanguage
index 25bf7c0..a71d8be 100644
--- a/Syntaxes/JavaScript Basic.tmLanguage	
+++ b/Syntaxes/JavaScript Basic.tmLanguage	
@@ -201,19 +201,24 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>storage.type.function.js</string>
+					<string>punctuation.separator.key-value.js</string>
 				</dict>
 				<key>3</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.parameters.begin.js</string>
+					<string>storage.type.function.js</string>
 				</dict>
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>variable.parameter.function.js</string>
+					<string>punctuation.definition.parameters.begin.js</string>
 				</dict>
 				<key>5</key>
+				<dict>
+					<key>name</key>
+					<string>variable.parameter.function.js</string>
+				</dict>
+				<key>6</key>
 				<dict>
 					<key>name</key>
 					<string>punctuation.definition.parameters.end.js</string>
@@ -222,7 +227,7 @@
 			<key>comment</key>
 			<string>match stuff like: foobar: function() { … }</string>
 			<key>match</key>
-			<string>\b([a-zA-Z_?.$][\w?.$]*)\s*:\s*\b(function)?\s*(\()(.*?)(\))</string>
+			<string>\b([a-zA-Z_?.$][\w?.$]*)\s*(:)\s*\b(function)?\s*(\()(.*?)(\))</string>
 			<key>name</key>
 			<string>meta.function.json.js</string>
 		</dict>
@@ -237,14 +242,19 @@
 				<key>10</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.parameters.begin.js</string>
+					<string>storage.type.function.js</string>
 				</dict>
 				<key>11</key>
 				<dict>
 					<key>name</key>
-					<string>variable.parameter.function.js</string>
+					<string>punctuation.definition.parameters.begin.js</string>
 				</dict>
 				<key>12</key>
+				<dict>
+					<key>name</key>
+					<string>variable.parameter.function.js</string>
+				</dict>
+				<key>13</key>
 				<dict>
 					<key>name</key>
 					<string>punctuation.definition.parameters.end.js</string>
@@ -287,13 +297,13 @@
 				<key>9</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function.js</string>
+					<string>punctuation.separator.key-value.js</string>
 				</dict>
 			</dict>
 			<key>comment</key>
 			<string>Attempt to match "foo": function</string>
 			<key>match</key>
-			<string>(?:((')(.*?)('))|((")(.*?)(")))\s*:\s*\b(function)?\s*(\()(.*?)(\))</string>
+			<string>(?:((')(.*?)('))|((")(.*?)(")))\s*(:)\s*\b(function)?\s*(\()(.*?)(\))</string>
 			<key>name</key>
 			<string>meta.function.json.js</string>
 		</dict>