Don't highlight lone '...' and '>>>' in docstrings

Yury Selivanov · Yury Selivanov · commit 0935b72d7301 · 2015-10-20T23:46:36.000-04:00
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -245,7 +245,7 @@ repository:
       (?x)
         (?:
           (?:^|\\G) \\s* (?# '\\G' is necessary for ST)
-          ((?:>>>|\\.\\.\\.) \\s)
+          ((?:>>>|\\.\\.\\.) \\s) (?=\\s*\\S)
         )
       
     '''
diff --git a/grammars/MagicPython.syntax.yaml b/grammars/MagicPython.syntax.yaml
@@ -207,7 +207,7 @@ repository:
       (?x)
         (?:
           (?:^|\G) \s* (?# '\G' is necessary for ST)
-          ((?:>>>|\.\.\.) \s)
+          ((?:>>>|\.\.\.) \s) (?=\s*\S)
         )
     captures:
       '1': {name: keyword.control.flow.python}
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -387,7 +387,7 @@
         <string>(?x)
   (?:
     (?:^|\G) \s* (?# &apos;\G&apos; is necessary for ST)
-    ((?:&gt;&gt;&gt;|\.\.\.) \s)
+    ((?:&gt;&gt;&gt;|\.\.\.) \s) (?=\s*\S)
   )
 </string>
         <key>captures</key>
diff --git a/test/docstrings/prompt2.py b/test/docstrings/prompt2.py
@@ -0,0 +1,13 @@
+"""
+    def foo():
+        ...
+        >>>
+"""
+
+
+
+"""           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.multi.python
+    def foo(): : source.python, string.quoted.docstring.multi.python
+        ...   : source.python, string.quoted.docstring.multi.python
+        >>>   : source.python, string.quoted.docstring.multi.python
+"""           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
diff --git a/test/docstrings/prompt3.py b/test/docstrings/prompt3.py
@@ -0,0 +1,9 @@
+'''...'''
+...
+
+
+
+'''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.multi.python
+...           : source.python, string.quoted.docstring.multi.python
+'''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
+...           : constant.other.ellipsis.python, source.python

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ repository:`
`245`	`245`	`(?x)`
`246`	`246`	`(?:`
`247`	`247`	`(?:^\|\\G) \\s* (?# '\\G' is necessary for ST)`
`248`		`- ((?:>>>\|\\.\\.\\.) \\s)`
	`248`	`+ ((?:>>>\|\\.\\.\\.) \\s) (?=\\s*\\S)`
`249`	`249`	`)`
`250`	`250`
`251`	`251`	`'''`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ repository:`
`207`	`207`	`(?x)`
`208`	`208`	`(?:`
`209`	`209`	`(?:^\|\G) \s* (?# '\G' is necessary for ST)`
`210`		`- ((?:>>>\|\.\.\.) \s)`
	`210`	`+ ((?:>>>\|\.\.\.) \s) (?=\s*\S)`
`211`	`211`	`)`
`212`	`212`	`captures:`
`213`	`213`	`'1': {name: keyword.control.flow.python}`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@`
`387`	`387`	`<string>(?x)`
`388`	`388`	`(?:`
`389`	`389`	`(?:^\|\G) \s* (?# '\G' is necessary for ST)`
`390`		`- ((?:>>>\|\.\.\.) \s)`
	`390`	`+ ((?:>>>\|\.\.\.) \s) (?=\s*\S)`
`391`	`391`	`)`
`392`	`392`	`</string>`
`393`	`393`	`<key>captures</key>`