@@ -11,7 +11,6 @@ patterns:
 - include: '#support'
 - include: '#core'
 - include: '#special'
-- include: '#sugar'
 
 repository:
   arrow-function:
@@ -40,27 +39,31 @@ repository:
   brackets:
     patterns:
     - name: meta.function-call.method.with-arguments.js
-      match: (?x)(?<= \. ) ([_$a-zA-Z][_$\w]*)? (?=\()
+      match: >-
+        (?x)
+          (?<=\.)
+          ([_$a-zA-Z][_$\w]*)?
+          (?=\()
       captures:
         '1': {name: entity.name.function.js}
 
     - name: meta.group.braces.round
-      begin: (\()(?!\))
-      end: (\))
+      begin: (\()
       beginCaptures:
         '1': {name: meta.brace.round.js}
+      end: (\))
       endCaptures:
         '1': {name: meta.brace.round.js}
       patterns:
       - include: $base
 
     - name: meta.group.braces.square
-      begin: (\[)(?!\])
-      end: (\])
+      begin: (\[)
       beginCaptures:
-        '1': {name: meta.brace.round.js}
+        '1': {name: meta.brace.square.js}
+      end: (\])
       endCaptures:
-        '1': {name: meta.brace.round.js}
+        '1': {name: meta.brace.square.js}
       patterns:
       - include: $base
 
@@ -293,14 +296,14 @@ repository:
   literal-keywords:
     patterns:
     - name: meta.instance.constructor
-      begin: (new)\s+*(?=[a-zA-Z_?.$][\w?.$]*)
+      begin: (new)\s+(?=[_$a-zA-Z][_$\w.]*)
       beginCaptures:
         '1': {name: keyword.operator.new.js}
-      end: (?![a-zA-Z_?.$][\w?.$]*)
+      end: (?![_$a-zA-Z][_$\w.]*)
       patterns:
         - include: '#support'
         - name: entity.name.type.new.js
-          match: ([a-zA-Z_?.$][\w?.$]*)
+          match: ([_$a-zA-Z][_$\w.]*)
 
     - name: storage.type.js
       match: \b(var|let|const)\b
@@ -652,7 +655,7 @@ repository:
     - name: invalid.deprecated.inconsistent.js
       match: (?i)</\s*script\s*>
 
-  sugar:
+  leading-space:
     patterns:
     - name: meta.leading-tabs
       begin: ^(?=(\t|  ))