Add pythonic comments to multi-line regexp strings.

vpetrovykh · vpetrovykh · commit 2d5d68d79b5b · 2015-10-14T21:44:45.000-04:00
diff --git a/grammars/MagicPython.YAML-tmLanguage b/grammars/MagicPython.YAML-tmLanguage
@@ -280,7 +280,7 @@ repository:
     endCaptures:
       '0': {name: punctuation.definition.string.end.python}
     patterns:
-      - include: 'source.regexp.python'
+      - include: '#regexp-multiline'
 
   regexp-double-quoted-multi-line:
     name: string.regexp.quoted.triple.python
@@ -293,8 +293,13 @@ repository:
       '5': {name: punctuation.definition.string.begin.python}
     endCaptures:
       '0': {name: punctuation.definition.string.end.python}
+    patterns:
+      - include: '#regexp-multiline'
+
+  regexp-multiline:
     patterns:
       - include: 'source.regexp.python'
+      - include: '#comments'
 
   string:
     patterns:
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -442,7 +442,7 @@ repository:
         name: "punctuation.definition.string.end.python"
     patterns: [
       {
-        include: "source.regexp.python"
+        include: "#regexp-multiline"
       }
     ]
   "regexp-double-quoted-multi-line":
@@ -461,10 +461,19 @@ repository:
     endCaptures:
       "0":
         name: "punctuation.definition.string.end.python"
+    patterns: [
+      {
+        include: "#regexp-multiline"
+      }
+    ]
+  "regexp-multiline":
     patterns: [
       {
         include: "source.regexp.python"
       }
+      {
+        include: "#comments"
+      }
     ]
   string:
     patterns: [
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -741,7 +741,7 @@
         <array>
           <dict>
             <key>include</key>
-            <string>source.regexp.python</string>
+            <string>#regexp-multiline</string>
           </dict>
         </array>
       </dict>
@@ -784,12 +784,26 @@
             <string>punctuation.definition.string.end.python</string>
           </dict>
         </dict>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>include</key>
+            <string>#regexp-multiline</string>
+          </dict>
+        </array>
+      </dict>
+      <key>regexp-multiline</key>
+      <dict>
         <key>patterns</key>
         <array>
           <dict>
             <key>include</key>
             <string>source.regexp.python</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#comments</string>
+          </dict>
         </array>
       </dict>
       <key>string</key>
diff --git a/test/regexp/comments2.re b/test/regexp/comments2.re
@@ -1,8 +1,8 @@
 (?x)
     foo     (?#
 comment 1
-            )
-    bar     (?#comment 2)
+            ) bar
+    baz     (?#comment 2)
 
 
 
@@ -12,7 +12,8 @@ comment 1
 comment 1     : comment.regexp, source.regexp.python
               : comment.regexp, source.regexp.python
 )             : comment.regexp, punctuation.comments.end.regexp, source.regexp.python
-    bar       : source.regexp.python
+ bar          : source.regexp.python
+    baz       : source.regexp.python
 (?#           : comment.regexp, punctuation.comments.begin.regexp, source.regexp.python
 comment 2     : comment.regexp, source.regexp.python
 )             : comment.regexp, punctuation.comments.end.regexp, source.regexp.python

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ repository:`
`442`	`442`	`name: "punctuation.definition.string.end.python"`
`443`	`443`	`patterns: [`
`444`	`444`	`{`
`445`		`- include: "source.regexp.python"`
	`445`	`+ include: "#regexp-multiline"`
`446`	`446`	`}`
`447`	`447`	`]`
`448`	`448`	`"regexp-double-quoted-multi-line":`
`@@ -461,10 +461,19 @@ repository:`
`461`	`461`	`endCaptures:`
`462`	`462`	`"0":`
`463`	`463`	`name: "punctuation.definition.string.end.python"`
	`464`	`+ patterns: [`
	`465`	`+ {`
	`466`	`+ include: "#regexp-multiline"`
	`467`	`+ }`
	`468`	`+ ]`
	`469`	`+ "regexp-multiline":`
`464`	`470`	`patterns: [`
`465`	`471`	`{`
`466`	`472`	`include: "source.regexp.python"`
`467`	`473`	`}`
	`474`	`+ {`
	`475`	`+ include: "#comments"`
	`476`	`+ }`
`468`	`477`	`]`
`469`	`478`	`string:`
`470`	`479`	`patterns: [`