Make the scope for opening/closing parenthesis and brackets consistent.

Author: vpetrovykh

grammars/MagicPython.cson

@@ -1210,7 +1210,6 @@ repository:
       }
     ]
   "item-index":
-    name: "meta.item-access.arguments.python"
     begin: "(\\[)"
     end: "(?=\\])"
     beginCaptures:
@@ -1364,12 +1363,12 @@ repository:
       }
     ]
   "function-arguments":
-    name: "meta.function-call.arguments.python"
     begin: "(\\()"
     end: "(?=\\))(?!\\)\\s*\\()"
     beginCaptures:
       "1":
         name: "punctuation.definition.arguments.begin.python"
+    contentName: "meta.function-call.arguments.python"
     patterns: [
       {
         name: "punctuation.separator.arguments.python"

grammars/MagicPython.syntax.yaml

@@ -814,7 +814,6 @@ repository:
             \b ([[:alpha:]_]\w*) \b
 
   item-index:
-    name:  meta.item-access.arguments.python
     begin: (\[)
     end: (?=\])
     beginCaptures:
@@ -909,11 +908,11 @@ repository:
             \b ([[:alpha:]_]\w*) \b
 
   function-arguments:
-    name: meta.function-call.arguments.python
     begin: (\()
     end: (?=\))(?!\)\s*\()
     beginCaptures:
       '1': {name: punctuation.definition.arguments.begin.python}
+    contentName: meta.function-call.arguments.python
     patterns:
       - name: punctuation.separator.arguments.python
         match: ','

grammars/MagicPython.tmLanguage

@@ -1968,8 +1968,6 @@ it's not tokenized as ellipsis.
       </dict>
       <key>item-index</key>
       <dict>
-        <key>name</key>
-        <string>meta.item-access.arguments.python</string>
         <key>begin</key>
         <string>(\[)</string>
         <key>end</key>
@@ -2201,8 +2199,6 @@ it&apos;s not tokenized as ellipsis.
       </dict>
       <key>function-arguments</key>
       <dict>
-        <key>name</key>
-        <string>meta.function-call.arguments.python</string>
         <key>begin</key>
         <string>(\()</string>
         <key>end</key>
@@ -2215,6 +2211,8 @@ it&apos;s not tokenized as ellipsis.
             <string>punctuation.definition.arguments.begin.python</string>
           </dict>
         </dict>
+        <key>contentName</key>
+        <string>meta.function-call.arguments.python</string>
         <key>patterns</key>
         <array>
           <dict>

misc/scopes

@@ -52,13 +52,11 @@ meta.character.set.regexp
 meta.class.inheritance.python
 meta.class.python
 meta.expression.python
-meta.function-call.arguments.python
 meta.function-call.generic.python
 meta.function-call.python
 meta.function.decorator.python
 meta.function.parameters.python
 meta.function.python
-meta.item-access.arguments.python
 meta.item-access.python
 meta.lambda-function.python
 meta.named.regexp

test/calls/call1.py

@@ -3,14 +3,14 @@
 
 
 some_call     : meta.function-call.generic.python, meta.function-call.python, source.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 A             : constant.other.caps.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
  b            : meta.function-call.arguments.python, meta.function-call.python, source.python
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
               : meta.function-call.arguments.python, meta.function-call.python, source.python
 c             : meta.function-call.arguments.python, meta.function-call.python, meta.item-access.python, source.python
-[             : meta.function-call.arguments.python, meta.function-call.python, meta.item-access.arguments.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
+[             : meta.function-call.arguments.python, meta.function-call.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 1             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, meta.item-access.arguments.python, meta.item-access.python, source.python
 ]             : meta.function-call.arguments.python, meta.function-call.python, meta.item-access.python, punctuation.definition.arguments.end.python, source.python
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python

test/calls/call2.py

@@ -3,7 +3,7 @@
 
 
 foo           : meta.function-call.generic.python, meta.function-call.python, source.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 from          : keyword.control.flow.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 =             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 1             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, source.python

test/calls/call3.py

@@ -6,12 +6,12 @@
 
 foo.          : source.python
 class         : keyword.control.flow.python, meta.function-call.python, source.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 a             : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo.          : source.python
 and           : keyword.control.flow.python, meta.function-call.python, source.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
 .             : source.python

test/calls/call4.py

@@ -9,7 +9,7 @@
 1             : source.python
               : source.python
 foo           : meta.function-call.generic.python, meta.function-call.python, source.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 bar           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
 =             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 baz           : meta.function-call.arguments.python, meta.function-call.python, source.python

test/calls/print1.py

@@ -21,7 +21,7 @@
 *             : keyword.operator.python, source.python
 2             : constant.numeric.dec.python, source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 "             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
 is            : meta.function-call.arguments.python, meta.function-call.python, source.python, string.quoted.single.python
 "             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
@@ -34,7 +34,7 @@
 print         : source.python, support.function.builtin.python
  x,           : source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 x             : meta.function-call.arguments.python, meta.function-call.python, source.python
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
               : meta.function-call.arguments.python, meta.function-call.python, source.python
@@ -46,7 +46,7 @@
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 print         : source.python, support.function.builtin.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 print         : source.python, support.function.builtin.python
               : source.python
@@ -56,7 +56,7 @@
 er            : source.python, string.quoted.single.python
 "             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 "             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
 er            : meta.function-call.arguments.python, meta.function-call.python, source.python, string.quoted.single.python
 "             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
@@ -68,13 +68,13 @@
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
               : meta.function-call.python, source.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 x             : meta.function-call.arguments.python, meta.function-call.python, source.python
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
  y            : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 (             : meta.function-call.arguments.python, meta.function-call.python, punctuation.parenthesis.begin.python, source.python
 x, y          : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.arguments.python, meta.function-call.python, punctuation.parenthesis.end.python, source.python

test/classes/class10.py

@@ -7,7 +7,7 @@ class         : meta.class.python, source.python, storage.type.class.python
 Foo           : entity.name.type.class.python, meta.class.python, source.python
 (             : meta.class.inheritance.python, meta.class.python, punctuation.definition.inheritance.begin.python, source.python
 Bar           : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, meta.function-call.python, source.python
-(             : meta.class.inheritance.python, meta.class.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.class.inheritance.python, meta.class.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 q             : meta.class.inheritance.python, meta.class.python, meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
 =             : keyword.operator.assignment.python, meta.class.inheritance.python, meta.class.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 1             : constant.numeric.dec.python, meta.class.inheritance.python, meta.class.python, meta.function-call.arguments.python, meta.function-call.python, source.python

test/classes/class11.py

@@ -46,12 +46,12 @@ def           : meta.function.python, source.python, storage.type.function.pytho
  b            : source.python
               : source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 self          : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.language.special.self.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
               : source.python
 self          : meta.function-call.python, source.python, variable.language.special.self.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
         a     : source.python
 .             : source.python
@@ -69,6 +69,6 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 2             : constant.numeric.dec.python, source.python
               : source.python
 self          : meta.item-access.python, source.python, variable.language.special.self.python
-[             : meta.item-access.arguments.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
+[             : meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 123           : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, source.python
 ]             : meta.item-access.python, punctuation.definition.arguments.end.python, source.python

test/classes/class12.py

@@ -51,12 +51,12 @@ def           : meta.function.python, source.python, storage.type.function.pytho
  b            : source.python
               : source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 cls           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.language.special.cls.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
               : source.python
 cls           : meta.function-call.python, source.python, variable.language.special.cls.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
               : source.python
 cls           : source.python, variable.language.special.cls.python
@@ -76,6 +76,6 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 __name__      : source.python, support.variable.magic.python
               : source.python
 cls           : meta.item-access.python, source.python, variable.language.special.cls.python
-[             : meta.item-access.arguments.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
+[             : meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 123           : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, source.python
 ]             : meta.item-access.python, punctuation.definition.arguments.end.python, source.python

test/expressions/const1.py

@@ -33,6 +33,6 @@
 self          : source.python, variable.language.special.self.python
 .             : source.python
 FOOO          : meta.function-call.generic.python, meta.function-call.python, source.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
  _ _1 __1 _1A  __1A _a __a __ ___ ___a ___1 __aA ___Aa : source.python

test/expressions/expr10.py

@@ -10,7 +10,7 @@
               : source.python
 ...           : constant.other.ellipsis.python, source.python
 a             : meta.function-call.generic.python, meta.function-call.python, source.python
-(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 ...           : constant.other.ellipsis.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
               : meta.function-call.arguments.python, meta.function-call.python, source.python

test/expressions/expr11.py

@@ -8,7 +8,7 @@
 self          : source.python, variable.language.special.self.python
 .             : source.python
 some_list     : meta.item-access.python, source.python
-[             : meta.item-access.arguments.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
+[             : meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 1             : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, source.python
 :             : meta.item-access.arguments.python, meta.item-access.python, source.python
 2             : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, source.python

test/expressions/expr12.py

@@ -6,7 +6,7 @@
 
 print         : meta.item-access.python, source.python, support.function.builtin.python
               : meta.item-access.python, source.python
-[             : meta.item-access.arguments.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
+[             : meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 ]             : meta.item-access.python, punctuation.definition.arguments.end.python, source.python
 print         : source.python, support.function.builtin.python
               : source.python