Clean up pattern groups

Closes #276.

Author: MaximSokolov

grammars/javascript.cson

@@ -20,14 +20,16 @@
 'name': 'JavaScript'
 'patterns': [
   {
-    'comment': 'ES6 import'
+    # ES6 import
     'begin': '(?<!\\.)\\b(import)(?!\\s*:)\\b'
     'beginCaptures':
       '1':
         'name': 'keyword.control.js'
+    'end': '(?=;|$)'
+    'name': 'meta.import.js'
     'patterns': [
       {
-        'comment': '{ member1 , member2 as alias2 , [...] }'
+        # { member1 , member2 as alias2 , [...] }
         'begin': '\\{'
         'beginCaptures':
           0:
@@ -38,7 +40,14 @@
             'name': 'punctuation.definition.modules.end.js'
         'patterns': [
           {
-            'comment': '(default|name) as alias'
+            # (default|name) as alias
+            'match': '''(?x)
+              (?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)
+              \\s*
+              (\\b as \\b)
+              \\s*
+              (?: (\\b default \\b | \\*) | \\b([a-zA-Z_$][\\w$]*)\\b)
+            '''
             'captures':
               '1':
                 'name': 'variable.language.default.js'
@@ -50,13 +59,6 @@
                 'name': 'invalid.illegal.js'
               '5':
                 'name': 'variable.other.module-alias.js'
-            'match': '''(?x)
-              (?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)
-              \\s*
-              (\\b as \\b)
-              \\s*
-              (?: (\\b default \\b | \\*) | \\b([a-zA-Z_$][\\w$]*)\\b)
-            '''
           }
           {
             'match': ','
@@ -72,7 +74,14 @@
         ]
       }
       {
-        'comment': '(default|*|name) as alias'
+        # (default|*|name) as alias
+        'match': '''(?x)
+          (?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)
+          \\s*
+          (\\b as \\b)
+          \\s*
+          (?: (\\b default \\b | \\*) | \\b([a-zA-Z_$][\\w$]*)\\b)
+        '''
         'captures':
           '1':
             'name': 'variable.language.default.js'
@@ -86,13 +95,6 @@
             'name': 'invalid.illegal.js'
           '6':
             'name': 'variable.other.module-alias.js'
-        'match': '''(?x)
-          (?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)
-          \\s*
-          (\\b as \\b)
-          \\s*
-          (?: (\\b default \\b | \\*) | \\b([a-zA-Z_$][\\w$]*)\\b)
-        '''
       }
       {
         'match': '\\*'
@@ -121,11 +123,9 @@
         'name': 'meta.delimiter.object.comma.js'
       }
     ]
-    'end': '(?=;|$)'
-    'name': 'meta.import.js'
   }
   {
-    'comment': 'ES6 export: `export default (variable|class|function, etc.)`'
+    # ES6 export: export default (variable|class|function, etc.)
     'match': '''(?x)
       \\b(export)\\b\\s*
       \\b(default)\\b\\s*
@@ -142,17 +142,19 @@
         'name': 'variable.other.module.js'
   }
   {
-    'comment': 'ES6 export, re-export: `export {member as alias, [...]} [from ...]`'
+    # ES6 export, re-export: export {member as alias, [...]} [from ...]
     'begin': '(?<!\\.)\\b(export)(?!\\s*:)\\b'
     'beginCaptures':
       '1':
         'name': 'keyword.control.js'
+    'end': '(?=;|\\bfunction\\b|\\bclass\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|$)'
+    'name': 'meta.export.js'
     'patterns': [
       {
         'include': '#numbers'
       }
       {
-        'comment': '`{ member1 , member2 as alias2 , [...] }` inside re-export'
+        # { member1 , member2 as alias2 , [...] } inside re-export
         'begin': '\\{(?=.*\\bfrom\\b)'
         'beginCaptures':
           0:
@@ -163,7 +165,14 @@
             'name': 'punctuation.definition.modules.end.js'
         'patterns': [
           {
-            'comment': '(default|name) as alias'
+            # (default|name) as alias
+            'match': '''(?x)
+              (?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)
+              \\s*
+              (\\b as \\b)
+              \\s*
+              (?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)
+            '''
             'captures':
               '1':
                 'name': 'variable.language.default.js'
@@ -177,13 +186,6 @@
                 'name': 'invalid.illegal.js'
               '6':
                 'name': 'variable.other.module-alias.js'
-            'match': '''(?x)
-              (?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)
-              \\s*
-              (\\b as \\b)
-              \\s*
-              (?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)
-            '''
           }
           {
             'match': ','
@@ -199,7 +201,7 @@
         ]
       }
       {
-        'comment': '{ member1 , member2 as alias2 , [...] }'
+        # { member1 , member2 as alias2 , [...] }
         'begin': '(?![a-zA-Z_$0-9])\\{'
         'beginCaptures':
           0:
@@ -210,7 +212,7 @@
             'name': 'punctuation.definition.modules.end.js'
         'patterns': [
           {
-            'comment': 'name as (default|alias)'
+            # name as (default|alias)
             'captures':
               '1':
                 'name': 'invalid.illegal.js'
@@ -275,8 +277,6 @@
         'include': '#operators'
       }
     ]
-    'end': '(?=;|\\bfunction\\b|\\bclass\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|$)'
-    'name': 'meta.export.js'
   }
   {
     'match': '''(?x)
@@ -816,12 +816,12 @@
     'include': '#comments'
   }
   {
+    'match': '(<!--|-->)'
     'captures':
       '0':
         'name': 'punctuation.definition.comment.html.js'
       '2':
         'name': 'punctuation.definition.comment.html.js'
-    'match': '(<!--|-->)'
     'name': 'comment.block.html.js'
   }
   {
@@ -1114,13 +1114,13 @@
     'name': 'meta.delimiter.method.period.js'
   }
   {
+    # Allows the special return snippet to fire.
+    'match': '({)(})'
     'captures':
       '1':
         'name': 'punctuation.section.scope.begin.js'
       '2':
         'name': 'punctuation.section.scope.end.js'
-    'comment': 'Allows the special return snippet to fire.'
-    'match': '({)(})'
   }
   {
     'begin': '{'
@@ -1751,23 +1751,29 @@
     'patterns': [
       {
         'begin': '/\\*\\*(?!/)'
-        'captures':
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.comment.js'
+        'end': '\\*/'
+        'endCaptures':
           '0':
             'name': 'punctuation.definition.comment.js'
+        'name': 'comment.block.documentation.js'
         'patterns': [
           {
             'include': '#docblock'
           }
         ]
-        'end': '\\*/'
-        'name': 'comment.block.documentation.js'
       }
       {
         'begin': '/\\*'
-        'captures':
+        'beginCaptures':
           '0':
             'name': 'punctuation.definition.comment.js'
         'end': '\\*/'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.comment.js'
         'name': 'comment.block.js'
       }
       {