Change 'separator.continuation.line.python' to 'punctuation.separator...'

vpetrovykh · vpetrovykh · commit 75c434c0510c · 2016-12-12T17:43:10.000-05:00
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -482,7 +482,7 @@ repository:
         match: "(\\\\)\\s*(\\S.*$\\n?)"
         captures:
           "1":
-            name: "separator.continuation.line.python"
+            name: "punctuation.separator.continuation.line.python"
           "2":
             name: "invalid.illegal.line.continuation.python"
       }
@@ -500,7 +500,7 @@ repository:
         '''
         beginCaptures:
           "1":
-            name: "separator.continuation.line.python"
+            name: "punctuation.separator.continuation.line.python"
         patterns: [
           {
             include: "#regexp"
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -756,7 +756,7 @@
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>separator.continuation.line.python</string>
+                <string>punctuation.separator.continuation.line.python</string>
               </dict>
               <key>2</key>
               <dict>
@@ -782,7 +782,7 @@
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>separator.continuation.line.python</string>
+                <string>punctuation.separator.continuation.line.python</string>
               </dict>
             </dict>
             <key>patterns</key>
diff --git a/grammars/src/MagicPython.syntax.yaml b/grammars/src/MagicPython.syntax.yaml
@@ -478,7 +478,7 @@ repository:
     patterns:
       - match: '(\\)\s*(\S.*$\n?)'
         captures:
-          '1': {name: separator.continuation.line.python}
+          '1': {name: punctuation.separator.continuation.line.python}
           '2': {name: invalid.illegal.line.continuation.python}
       - begin: '(\\)\s*$\n?'
         # Line continuation matching ends on anything that is not a
@@ -493,7 +493,7 @@ repository:
                 (\G $)  (?# '\G' is necessary for ST)
             )
         beginCaptures:
-          '1': {name: separator.continuation.line.python}
+          '1': {name: punctuation.separator.continuation.line.python}
         patterns:
           - include: '#regexp'
           - include: '#string'
diff --git a/misc/scopes b/misc/scopes
@@ -114,9 +114,9 @@ punctuation.section.function.lambda.begin.python
 punctuation.separator.annotation.python
 punctuation.separator.annotation.result.python
 punctuation.separator.arguments.python
+punctuation.separator.continuation.line.python
 punctuation.separator.inheritance.python
 punctuation.separator.parameters.python
-separator.continuation.line.python
 storage.modifier.declaration.python
 storage.modifier.flag.regexp
 storage.type.class.python
diff --git a/test/builtins/builtins5.py b/test/builtins/builtins5.py
@@ -12,7 +12,7 @@
 True          : keyword.illegal.name.python, source.python
 some          : source.python
 .             : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
               : source.python
 True          : keyword.illegal.name.python, source.python
diff --git a/test/classes/super1.py b/test/classes/super1.py
@@ -53,7 +53,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 .             : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
 __init__      : meta.function-call.python, source.python, support.function.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
diff --git a/test/docstrings/continuation1.py b/test/docstrings/continuation1.py
@@ -20,7 +20,7 @@
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
 r             : source.python, storage.type.string.python, string.regexp.quoted.multi.python
 '''           : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.multi.python
@@ -40,7 +40,7 @@
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
  docstring    : comment.line.number-sign.python, source.python
diff --git a/test/docstrings/continuation3.py b/test/docstrings/continuation3.py
@@ -14,7 +14,7 @@
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
 r             : source.python, storage.type.string.python, string.regexp.quoted.single.python
 '             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.single.python
@@ -34,7 +34,7 @@
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
  docstring    : comment.line.number-sign.python, source.python
diff --git a/test/docstrings/continuation4.py b/test/docstrings/continuation4.py
@@ -22,7 +22,7 @@
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
               : source.python
 r             : source.python, storage.type.string.python, string.regexp.quoted.multi.python
@@ -45,7 +45,7 @@
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
               : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
diff --git a/test/expressions/expr19.py b/test/expressions/expr19.py
@@ -21,7 +21,7 @@
 foo           : comment.line.number-sign.python, source.python
 a             : source.python
 .             : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
 foo           : comment.line.number-sign.python, source.python
@@ -37,7 +37,7 @@
 '             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
 a             : source.python
 .             : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
 '             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
 bar           : source.python, string.quoted.single.python
diff --git a/test/functions/decl12.py b/test/functions/decl12.py
@@ -10,7 +10,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 s             : meta.function.parameters.python, meta.function.python, source.python, variable.parameter.function.language.python
 )             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
               : meta.function.python, source.python
-\             : meta.function.python, separator.continuation.line.python, source.python
+\             : meta.function.python, punctuation.separator.continuation.line.python, source.python
               : meta.function.python, source.python
               : meta.function.python, source.python
 ->            : meta.function.python, punctuation.separator.annotation.result.python, source.python
diff --git a/test/functions/decorators5.py b/test/functions/decorators5.py
@@ -11,14 +11,14 @@ def foo(): pass
 a             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
 .             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
-\             : meta.function.decorator.python, separator.continuation.line.python, source.python
+\             : meta.function.decorator.python, punctuation.separator.continuation.line.python, source.python
               : meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
 b             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
 .             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
-\             : meta.function.decorator.python, separator.continuation.line.python, source.python
+\             : meta.function.decorator.python, punctuation.separator.continuation.line.python, source.python
               : meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
 c             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
@@ -27,7 +27,7 @@ def foo(): pass
 .             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
 z             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
-\             : meta.function.decorator.python, separator.continuation.line.python, source.python
+\             : meta.function.decorator.python, punctuation.separator.continuation.line.python, source.python
               : meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
 baz           : entity.name.function.decorator.python, meta.function.decorator.python, source.python
diff --git a/test/functions/decorators6.py b/test/functions/decorators6.py
@@ -14,7 +14,7 @@ def foo(): pass
               : meta.function.decorator.python, source.python
 .             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
-\             : meta.function.decorator.python, separator.continuation.line.python, source.python
+\             : meta.function.decorator.python, punctuation.separator.continuation.line.python, source.python
               : meta.function.decorator.python, source.python
               : meta.function.decorator.python, source.python
 c             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
diff --git a/test/functions/decorators7.py b/test/functions/decorators7.py
@@ -54,4 +54,3 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
-
diff --git a/test/functions/lambda6.py b/test/functions/lambda6.py
@@ -24,7 +24,7 @@
 }             : meta.function.lambda.parameters.python, meta.lambda-function.python, punctuation.definition.dict.end.python, source.python
 ,             : meta.function.lambda.parameters.python, meta.lambda-function.python, punctuation.separator.parameters.python, source.python
               : meta.function.lambda.parameters.python, meta.lambda-function.python, source.python
-\             : meta.function.lambda.parameters.python, meta.lambda-function.python, separator.continuation.line.python, source.python
+\             : meta.function.lambda.parameters.python, meta.lambda-function.python, punctuation.separator.continuation.line.python, source.python
               : meta.function.lambda.parameters.python, meta.lambda-function.python, source.python
                : meta.function.lambda.parameters.python, meta.lambda-function.python, source.python
 d             : meta.function.lambda.parameters.python, meta.lambda-function.python, source.python, variable.parameter.function.language.python
diff --git a/test/illegals/backticks2.py b/test/illegals/backticks2.py
@@ -9,7 +9,7 @@
 =             : keyword.operator.assignment.python, source.python
               : source.python
 `             : invalid.deprecated.backtick.python, source.python
-\             : invalid.deprecated.backtick.python, separator.continuation.line.python, source.python
+\             : invalid.deprecated.backtick.python, punctuation.separator.continuation.line.python, source.python
               : invalid.deprecated.backtick.python, source.python
 123           : constant.numeric.dec.python, invalid.deprecated.backtick.python, source.python
 `             : invalid.deprecated.backtick.python, source.python
diff --git a/test/linecont/linecont1.py b/test/linecont/linecont1.py
@@ -7,7 +7,7 @@ def foo(): pass
               : source.python
 +             : keyword.operator.arithmetic.python, source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
 sdgfsdf       : invalid.illegal.line.continuation.python, source.python
 def           : meta.function.python, source.python, storage.type.function.python
diff --git a/test/linecont/linecont2.py b/test/linecont/linecont2.py
@@ -7,7 +7,7 @@
               : source.python
 +             : keyword.operator.arithmetic.python, source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
               : source.python
               : source.python
 3             : constant.numeric.dec.python, source.python
diff --git a/test/strings/bad1.py b/test/strings/bad1.py
@@ -15,7 +15,7 @@ def foo(a=1): pass
               : invalid.illegal.newline.python, source.python, string.quoted.single.python
 foo           : source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
 ' \" \a \b \c \f \n \r \t \v \5 \55 \555 \05 \005" : invalid.illegal.line.continuation.python, source.python
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
diff --git a/test/strings/bad2.py b/test/strings/bad2.py
@@ -18,7 +18,7 @@ def foo(a=1): pass
               : invalid.illegal.newline.python, source.python, string.quoted.binary.single.python
 foo           : source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
 ' \" \a \b \c \f \n \r \t \v \5 \55 \555 \05 \005" : invalid.illegal.line.continuation.python, source.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
diff --git a/test/strings/bad3.py b/test/strings/bad3.py
@@ -15,7 +15,7 @@ def foo(a=1): pass # doesn't break!
               : invalid.illegal.newline.python, source.python, string.regexp.quoted.single.python
 foo           : source.python
               : source.python
-\             : separator.continuation.line.python, source.python
+\             : punctuation.separator.continuation.line.python, source.python
 ' \" \a \b \c \f \n \r \t \v \5 \55 \555 \05 \005" : invalid.illegal.line.continuation.python, source.python
               : source.python
 def           : meta.function.python, source.python, storage.type.function.python
