Make dosctrings scoping consistent with normal strings

1st1 · 1st1 · commit 92bed5a33d79 · 2015-10-22T01:05:18.000-04:00
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -159,7 +159,7 @@ repository:
         ]
       }
       {
-        name: "string.quoted.docstring.python"
+        name: "string.quoted.docstring.single.python"
         begin: "(\\'|\\\")"
         end: "(\\1)|((?<!\\\\)\\n)"
         beginCaptures:
@@ -180,7 +180,7 @@ repository:
         ]
       }
       {
-        name: "string.quoted.docstring.raw.python"
+        name: "string.quoted.docstring.raw.single.python"
         begin: "([rR])(\\'|\\\")"
         end: "(\\2)|((?<!\\\\)\\n)"
         beginCaptures:
diff --git a/grammars/MagicPython.syntax.yaml b/grammars/MagicPython.syntax.yaml
@@ -155,7 +155,7 @@ repository:
           - include: '#docstring-prompt'
           - include: '#codetags'
 
-      - name: string.quoted.docstring.python
+      - name: string.quoted.docstring.single.python
         begin: (\'|\")
         end: (\1)|((?<!\\)\n)
         beginCaptures:
@@ -167,7 +167,7 @@ repository:
           - include: '#codetags'
           - include: '#docstring-guts-unicode'
 
-      - name: string.quoted.docstring.raw.python
+      - name: string.quoted.docstring.raw.single.python
         begin: ([rR])(\'|\")
         end: (\2)|((?<!\\)\n)
         beginCaptures:
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -242,7 +242,7 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>string.quoted.docstring.python</string>
+            <string>string.quoted.docstring.single.python</string>
             <key>begin</key>
             <string>(\&apos;|\&quot;)</string>
             <key>end</key>
@@ -282,7 +282,7 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>string.quoted.docstring.raw.python</string>
+            <string>string.quoted.docstring.raw.single.python</string>
             <key>begin</key>
             <string>([rR])(\&apos;|\&quot;)</string>
             <key>end</key>
diff --git a/misc/scopes b/misc/scopes
@@ -121,9 +121,9 @@ storage.type.string.python
 string.quoted.binary.multi.python
 string.quoted.binary.single.python
 string.quoted.docstring.multi.python
-string.quoted.docstring.python
 string.quoted.docstring.raw.multi.python
-string.quoted.docstring.raw.python
+string.quoted.docstring.raw.single.python
+string.quoted.docstring.single.python
 string.quoted.multi.python
 string.quoted.raw.binary.multi.python
 string.quoted.raw.binary.single.python
diff --git a/test/docstrings/codetag2.py b/test/docstrings/codetag2.py
@@ -5,11 +5,11 @@ def foo():
 
 
 
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
- foo bar      : source.python, string.quoted.docstring.python
-XXX           : keyword.codetag.notation.python, source.python, string.quoted.docstring.python
- baz          : source.python, string.quoted.docstring.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+ foo bar      : source.python, string.quoted.docstring.single.python
+XXX           : keyword.codetag.notation.python, source.python, string.quoted.docstring.single.python
+ baz          : source.python, string.quoted.docstring.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
@@ -18,8 +18,8 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
- foo          : source.python, string.quoted.docstring.python
-FIXME         : keyword.codetag.notation.python, source.python, string.quoted.docstring.python
- baz          : source.python, string.quoted.docstring.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+ foo          : source.python, string.quoted.docstring.single.python
+FIXME         : keyword.codetag.notation.python, source.python, string.quoted.docstring.single.python
+ baz          : source.python, string.quoted.docstring.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
diff --git a/test/docstrings/continuation2.py b/test/docstrings/continuation2.py
@@ -3,7 +3,7 @@
 
 
 
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
-              : invalid.illegal.newline.python, source.python, string.quoted.docstring.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
-              : invalid.illegal.newline.python, source.python, string.quoted.docstring.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+              : invalid.illegal.newline.python, source.python, string.quoted.docstring.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+              : invalid.illegal.newline.python, source.python, string.quoted.docstring.single.python
diff --git a/test/docstrings/continuation3.py b/test/docstrings/continuation3.py
@@ -36,7 +36,7 @@
               : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
  docstring    : comment.line.number-sign.python, source.python
-r             : source.python, storage.type.string.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
->>> print()a[wer] : source.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python
+r             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.single.python
+>>> print()a[wer] : source.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.single.python
diff --git a/test/docstrings/def3.py b/test/docstrings/def3.py
@@ -28,11 +28,11 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
-TE            : source.python, string.quoted.docstring.python
-\'            : constant.character.python, source.python, string.quoted.docstring.python
-ST            : source.python, string.quoted.docstring.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+TE            : source.python, string.quoted.docstring.single.python
+\'            : constant.character.python, source.python, string.quoted.docstring.single.python
+ST            : source.python, string.quoted.docstring.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
@@ -41,12 +41,12 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
-r             : source.python, storage.type.string.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
-TE            : source.python, string.quoted.docstring.raw.python
-\'            : source.python, string.quoted.docstring.raw.python
-ST            : source.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python
+r             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.single.python
+TE            : source.python, string.quoted.docstring.raw.single.python
+\'            : source.python, string.quoted.docstring.raw.single.python
+ST            : source.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.single.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
@@ -55,12 +55,12 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
-R             : source.python, storage.type.string.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
-TE            : source.python, string.quoted.docstring.raw.python
-\'            : source.python, string.quoted.docstring.raw.python
-ST            : source.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python
+R             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.single.python
+TE            : source.python, string.quoted.docstring.raw.single.python
+\'            : source.python, string.quoted.docstring.raw.single.python
+ST            : source.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.single.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
diff --git a/test/docstrings/def4.py b/test/docstrings/def4.py
@@ -28,11 +28,11 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
-"             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
-TE            : source.python, string.quoted.docstring.python
-\"            : constant.character.python, source.python, string.quoted.docstring.python
-ST            : source.python, string.quoted.docstring.python
-"             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+TE            : source.python, string.quoted.docstring.single.python
+\"            : constant.character.python, source.python, string.quoted.docstring.single.python
+ST            : source.python, string.quoted.docstring.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
@@ -41,12 +41,12 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
-r             : source.python, storage.type.string.python, string.quoted.docstring.raw.python
-"             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
-TE            : source.python, string.quoted.docstring.raw.python
-\"            : source.python, string.quoted.docstring.raw.python
-ST            : source.python, string.quoted.docstring.raw.python
-"             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python
+r             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.single.python
+TE            : source.python, string.quoted.docstring.raw.single.python
+\"            : source.python, string.quoted.docstring.raw.single.python
+ST            : source.python, string.quoted.docstring.raw.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.single.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
@@ -55,12 +55,12 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
-R             : source.python, storage.type.string.python, string.quoted.docstring.raw.python
-"             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
-TE            : source.python, string.quoted.docstring.raw.python
-\"            : source.python, string.quoted.docstring.raw.python
-ST            : source.python, string.quoted.docstring.raw.python
-"             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python
+R             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
+"             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.single.python
+TE            : source.python, string.quoted.docstring.raw.single.python
+\"            : source.python, string.quoted.docstring.raw.single.python
+ST            : source.python, string.quoted.docstring.raw.single.python
+"             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.single.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
diff --git a/test/docstrings/mix2.py b/test/docstrings/mix2.py
@@ -18,9 +18,9 @@ def bar(self, a:'TEST')
 
 
 
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
-TEST          : source.python, string.quoted.docstring.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+TEST          : source.python, string.quoted.docstring.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
               : source.python
 class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.python, source.python
@@ -30,10 +30,10 @@ class         : meta.class.python, source.python, storage.type.class.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
  comment      : comment.line.number-sign.python, source.python
               : source.python
-R             : source.python, storage.type.string.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
-TEST          : source.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python
+R             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.single.python
+TEST          : source.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.single.python
               : source.python
               : meta.function.python, source.python
 def           : meta.function.python, source.python, storage.type.function.python
@@ -60,10 +60,10 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
 ok            : comment.line.number-sign.python, source.python
               : source.python
-r             : source.python, storage.type.string.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.python
-TEST          : source.python, string.quoted.docstring.raw.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.python
+r             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.single.python
+TEST          : source.python, string.quoted.docstring.raw.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.single.python
               : source.python
 with          : keyword.control.flow.python, source.python
  bar:         : source.python
@@ -94,9 +94,9 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 pass          : keyword.control.flow.python, source.python
               : source.python
-'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.python
-TEST          : source.python, string.quoted.docstring.python
-'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
+TEST          : source.python, string.quoted.docstring.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
               : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
  additional docstring : comment.line.number-sign.python, source.python
diff --git a/test/docstrings/module3.py b/test/docstrings/module3.py
diff --git a/test/docstrings/module4.py b/test/docstrings/module4.py
diff --git a/test/docstrings/oneline3.py b/test/docstrings/oneline3.py
diff --git a/test/regexp/python2.py b/test/regexp/python2.py
diff --git a/test/unicode/unicode1.py b/test/unicode/unicode1.py

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ repository:`
`159`	`159`	`]`
`160`	`160`	`}`
`161`	`161`	`{`
`162`		`- name: "string.quoted.docstring.python"`
	`162`	`+ name: "string.quoted.docstring.single.python"`
`163`	`163`	`begin: "(\\'\|\\\")"`
`164`	`164`	`end: "(\\1)\|((?<!\\\\)\\n)"`
`165`	`165`	`beginCaptures:`
`@@ -180,7 +180,7 @@ repository:`
`180`	`180`	`]`
`181`	`181`	`}`
`182`	`182`	`{`
`183`		`- name: "string.quoted.docstring.raw.python"`
	`183`	`+ name: "string.quoted.docstring.raw.single.python"`
`184`	`184`	`begin: "([rR])(\\'\|\\\")"`
`185`	`185`	`end: "(\\2)\|((?<!\\\\)\\n)"`
`186`	`186`	`beginCaptures:`