Remove special handling of empty strings

These can be matched with a grouped left/right scope match, there is no longer a need for a special scope.
textmate · Feb 22, 2016 · f44650d · f44650d
1 parent 1dcc46a
commit f44650d
Showing 1 changed file with 15 additions and 60 deletions.
diff --git a/Syntaxes/Python.tmLanguage b/Syntaxes/Python.tmLanguage
@@ -2235,19 +2235,14 @@
 					<key>comment</key>
 					<string>single quoted bytes-raw string</string>
 					<key>end</key>
-					<string>((?&lt;=""")(")""|""")</string>
+					<string>"""</string>
 					<key>endCaptures</key>
 					<dict>
-						<key>1</key>
+						<key>0</key>
 						<dict>
 							<key>name</key>
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.double.python</string>
-						</dict>
 					</dict>
 					<key>name</key>
 					<string>string.quoted.double.block.bytes-raw-regex.python</string>
@@ -2286,19 +2281,14 @@
 					<key>comment</key>
 					<string>single quoted bytes-raw string without regular expression highlighting</string>
 					<key>end</key>
-					<string>((?&lt;=""")(")""|""")</string>
+					<string>"""</string>
 					<key>endCaptures</key>
 					<dict>
-						<key>1</key>
+						<key>0</key>
 						<dict>
 							<key>name</key>
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.double.python</string>
-						</dict>
 					</dict>
 					<key>name</key>
 					<string>string.quoted.double.block.bytes-raw.python</string>
@@ -2467,19 +2457,14 @@
 					<key>comment</key>
 					<string>double quoted bytes string</string>
 					<key>end</key>
-					<string>((?&lt;=""")(")""|""")</string>
+					<string>"""</string>
 					<key>endCaptures</key>
 					<dict>
-						<key>1</key>
+						<key>0</key>
 						<dict>
 							<key>name</key>
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.double.python</string>
-						</dict>
 					</dict>
 					<key>name</key>
 					<string>string.quoted.double.block.bytes.python</string>
@@ -2617,7 +2602,7 @@
 					<key>comment</key>
 					<string>double-quoted raw string</string>
 					<key>end</key>
-					<string>((?&lt;=")(")|")|(\n)</string>
+					<string>(")|(\n)</string>
 					<key>endCaptures</key>
 					<dict>
 						<key>1</key>
@@ -2626,11 +2611,6 @@
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
 						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.double.python</string>
-						</dict>
-						<key>3</key>
 						<dict>
 							<key>name</key>
 							<string>invalid.illegal.unclosed-string.python</string>
@@ -2673,7 +2653,7 @@
 					<key>comment</key>
 					<string>double-quoted raw string</string>
 					<key>end</key>
-					<string>((?&lt;=")(")|")|(\n)</string>
+					<string>(")|(\n)</string>
 					<key>endCaptures</key>
 					<dict>
 						<key>1</key>
@@ -2682,11 +2662,6 @@
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
 						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.double.python</string>
-						</dict>
-						<key>3</key>
 						<dict>
 							<key>name</key>
 							<string>invalid.illegal.unclosed-string.python</string>
@@ -2867,7 +2842,7 @@
 					<key>comment</key>
 					<string>double quoted bytes string</string>
 					<key>end</key>
-					<string>((?&lt;=")(")|")|(\n)</string>
+					<string>(")|(\n)</string>
 					<key>endCaptures</key>
 					<dict>
 						<key>1</key>
@@ -2876,11 +2851,6 @@
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
 						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.double.python</string>
-						</dict>
-						<key>3</key>
 						<dict>
 							<key>name</key>
 							<string>invalid.illegal.unclosed-string.python</string>
@@ -3207,19 +3177,14 @@
 					<key>comment</key>
 					<string>single quoted bytes-raw string</string>
 					<key>end</key>
-					<string>((?&lt;=''')(')''|''')</string>
+					<string>'''</string>
 					<key>endCaptures</key>
 					<dict>
-						<key>1</key>
+						<key>0</key>
 						<dict>
 							<key>name</key>
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.single.python</string>
-						</dict>
 					</dict>
 					<key>name</key>
 					<string>string.quoted.single.block.bytes-raw-regex.python</string>
@@ -3258,19 +3223,14 @@
 					<key>comment</key>
 					<string>single quoted bytes-raw string</string>
 					<key>end</key>
-					<string>((?&lt;=''')(')''|''')</string>
+					<string>'''</string>
 					<key>endCaptures</key>
 					<dict>
-						<key>1</key>
+						<key>0</key>
 						<dict>
 							<key>name</key>
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.single.python</string>
-						</dict>
 					</dict>
 					<key>name</key>
 					<string>string.quoted.single.block.bytes-raw.python</string>
@@ -3439,19 +3399,14 @@
 					<key>comment</key>
 					<string>single quoted bytes string</string>
 					<key>end</key>
-					<string>((?&lt;=''')(')''|''')</string>
+					<string>'''</string>
 					<key>endCaptures</key>
 					<dict>
-						<key>1</key>
+						<key>0</key>
 						<dict>
 							<key>name</key>
 							<string>punctuation.definition.string.end.python</string>
 						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>meta.empty-string.single.python</string>
-						</dict>
 					</dict>
 					<key>name</key>
 					<string>string.quoted.single.block.bytes.python</string>