Add 'multi' to 'string.quoted.docstring' scope

Author: 1st1

Diff for: grammars/MagicPython.YAML-tmLanguage

@@ -97,7 +97,7 @@ repository:
 
   docstring:
     patterns:
-      - name: string.quoted.docstring.python
+      - name: string.quoted.docstring.multi.python
         begin: (\'\'\'|\"\"\")
         end: (\1)
         beginCaptures:
@@ -108,7 +108,7 @@ repository:
           - include: '#docstring-guts-common'
           - include: '#docstring-guts-unicode'
 
-      - name: string.quoted.docstring.raw.python
+      - name: string.quoted.docstring.raw.multi.python
         begin: ([rR])(\'\'\'|\"\"\")
         end: (\2)
         beginCaptures:

Diff for: grammars/MagicPython.cson

@@ -78,7 +78,7 @@ repository:
   docstring:
     patterns: [
       {
-        name: "string.quoted.docstring.python"
+        name: "string.quoted.docstring.multi.python"
         begin: "(\\'\\'\\'|\\\"\\\"\\\")"
         end: "(\\1)"
         beginCaptures:
@@ -97,7 +97,7 @@ repository:
         ]
       }
       {
-        name: "string.quoted.docstring.raw.python"
+        name: "string.quoted.docstring.raw.multi.python"
         begin: "([rR])(\\'\\'\\'|\\\"\\\"\\\")"
         end: "(\\2)"
         beginCaptures:

Diff for: grammars/MagicPython.tmLanguage

@@ -120,7 +120,7 @@
         <array>
           <dict>
             <key>name</key>
-            <string>string.quoted.docstring.python</string>
+            <string>string.quoted.docstring.multi.python</string>
             <key>begin</key>
             <string>(\&apos;\&apos;\&apos;|\&quot;\&quot;\&quot;)</string>
             <key>end</key>
@@ -155,7 +155,7 @@
           </dict>
           <dict>
             <key>name</key>
-            <string>string.quoted.docstring.raw.python</string>
+            <string>string.quoted.docstring.raw.multi.python</string>
             <key>begin</key>
             <string>([rR])(\&apos;\&apos;\&apos;|\&quot;\&quot;\&quot;)</string>
             <key>end</key>

Diff for: test/docstrings/class1.py

@@ -26,29 +26,29 @@ class         : meta.class.python, source.python, storage.type.class.python
 Foo           : entity.name.type.class.python, meta.class.python, source.python
 :             : meta.class.python, punctuation.section.class.begin.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.multi.python
+TEST          : source.python, string.quoted.docstring.multi.python
+'''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
               : source.python
 class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.python, source.python
 Foo           : entity.name.type.class.python, meta.class.python, source.python
 :             : meta.class.python, punctuation.section.class.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
-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.multi.python
+'''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+TEST          : source.python, string.quoted.docstring.raw.multi.python
+'''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.python
               : source.python
 class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.python, source.python
 Foo           : entity.name.type.class.python, meta.class.python, source.python
 :             : meta.class.python, punctuation.section.class.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
-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.multi.python
+'''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+TEST          : source.python, string.quoted.docstring.raw.multi.python
+'''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.python
               : source.python
 class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.python, source.python

Diff for: test/docstrings/class2.py

@@ -27,29 +27,29 @@ class         : meta.class.python, source.python, storage.type.class.python
 Foo           : entity.name.type.class.python, meta.class.python, source.python
 :             : meta.class.python, punctuation.section.class.begin.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.multi.python
+TEST          : source.python, string.quoted.docstring.multi.python
+"""           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
               : source.python
 class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.python, source.python
 Foo           : entity.name.type.class.python, meta.class.python, source.python
 :             : meta.class.python, punctuation.section.class.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
-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.multi.python
+"""           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+TEST          : source.python, string.quoted.docstring.raw.multi.python
+"""           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.python
               : source.python
 class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.python, source.python
 Foo           : entity.name.type.class.python, meta.class.python, source.python
 :             : meta.class.python, punctuation.section.class.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
-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.multi.python
+"""           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+TEST          : source.python, string.quoted.docstring.raw.multi.python
+"""           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.python
               : source.python
 class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.python, source.python

Diff for: test/docstrings/continuation1.py

@@ -42,9 +42,9 @@
               : 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
->>>           : keyword.control.flow.python, source.python, string.quoted.docstring.raw.python
-print()       : source.python, string.quoted.docstring.raw.python
-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.multi.python
+'''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+>>>           : keyword.control.flow.python, source.python, string.quoted.docstring.raw.multi.python
+print()       : source.python, string.quoted.docstring.raw.multi.python
+a[wer]        : source.python, string.quoted.docstring.raw.multi.python
+'''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.python

Diff for: test/docstrings/def1.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.multi.python
+TE            : source.python, string.quoted.docstring.multi.python
+\'            : constant.character.python, source.python, string.quoted.docstring.multi.python
+''ST          : source.python, string.quoted.docstring.multi.python
+'''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.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.multi.python
+'''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+TE            : source.python, string.quoted.docstring.raw.multi.python
+\'            : source.python, string.quoted.docstring.raw.multi.python
+''ST          : source.python, string.quoted.docstring.raw.multi.python
+'''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.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.multi.python
+'''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+TE            : source.python, string.quoted.docstring.raw.multi.python
+\'            : source.python, string.quoted.docstring.raw.multi.python
+''ST          : source.python, string.quoted.docstring.raw.multi.python
+'''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python

Diff for: test/docstrings/def2.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.multi.python
+TE            : source.python, string.quoted.docstring.multi.python
+\"            : constant.character.python, source.python, string.quoted.docstring.multi.python
+""ST          : source.python, string.quoted.docstring.multi.python
+"""           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.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.multi.python
+"""           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+TE            : source.python, string.quoted.docstring.raw.multi.python
+\"            : source.python, string.quoted.docstring.raw.multi.python
+""ST          : source.python, string.quoted.docstring.raw.multi.python
+"""           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.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.multi.python
+"""           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.raw.multi.python
+TE            : source.python, string.quoted.docstring.raw.multi.python
+\"            : source.python, string.quoted.docstring.raw.multi.python
+""ST          : source.python, string.quoted.docstring.raw.multi.python
+"""           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.raw.multi.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python