Integrated upstream changes (properly).

Author: Thomas Smith

extensions/flow_types.yaml

@@ -113,6 +113,18 @@ contexts: !merge
     - match: '{{method_lookahead}}'
       set: method-declaration
 
+    - match: |-
+        (?x)(?=
+          \#? {{identifier}}
+          \s* = \s*
+          {{either_func_lookahead}}
+        )
+      set:
+        - function-initializer
+        - flow-type-annotation-optional
+        - function-name-meta
+        - field-name
+
     - match: (?={{property_name}})
       set:
         - field-initializer-or-method-declaration
@@ -185,15 +197,6 @@ contexts: !merge
     - match: (?=\S)
       pop: true
 
-  # flow-type-comment-block:
-  #   - match: '/\*::'
-  #     scope: comment.block.js punctuation.definition.comment.begin.js
-  #     push:
-  #       - match: \*/
-  #         scope: comment.block.js punctuation.definition.comment.end.js
-  #         pop: true
-  #       - include: statements
-
   flow-type-pragma:
     - match: '(//)\s*(?=@)'
       scope: comment.line.double-slash.pragma.js

src/JavaScript.yaml

@@ -8,8 +8,9 @@ file_extensions:
 first_line_match: ^#!\s*/.*\b(node|js)\b
 scope: source.js
 variables:
-  identifier_start: '[_$\p{L}\p{Nl}]'
-  identifier_part: '[_$\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}\x{200C}\x{200D}]'
+  identifier_escape: (?:\\u(?:\h{4}|\{\h+\}))
+  identifier_start: (?:[_$\p{L}\p{Nl}]|{{identifier_escape}})
+  identifier_part: (?:[_$\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}\x{200C}\x{200D}]|{{identifier_escape}})
   identifier_break: (?!{{identifier_part}})
 
   identifier: (?:{{identifier_start}}{{identifier_part}}*{{identifier_break}})
@@ -384,7 +385,7 @@ contexts:
           scope: punctuation.section.block.end.js
           pop: true
         - include: variable-binding-spread
-        - match: (?={{identifier}})
+        - match: (?={{identifier}}|\[|'|")
           push:
             - initializer
             - variable-binding-object-alias
@@ -401,6 +402,8 @@ contexts:
   variable-binding-object-key:
     - match: '{{identifier}}(?=\s*:)'
       pop: true
+    - include: literal-string
+    - include: computed-property-name
     - include: variable-binding-name
     - include: else-pop
 
@@ -477,7 +480,7 @@ contexts:
           scope: punctuation.section.block.end.js
           pop: true
         - include: function-parameter-binding-spread
-        - match: (?={{identifier}})
+        - match: (?={{identifier}}|\[|'|")
           push:
             - initializer
             - function-parameter-binding-object-alias
@@ -493,6 +496,8 @@ contexts:
   function-parameter-binding-object-key:
     - match: '{{identifier}}(?=\s*:)'
       pop: true
+    - include: literal-string
+    - include: computed-property-name
     - include: function-parameter-binding-name
     - include: else-pop
 
@@ -696,23 +701,34 @@ contexts:
     - match: (?:const|let|var){{identifier_break}}
       scope: storage.type.js
       set:
-        - - match: (?:of|in){{identifier_break}}
-            scope: keyword.operator.word.js
-            set: expression
+        - - include: for-of-rest
           - match: (?=\S)
             set:
-              - statements-in-parens
+              - for-oldstyle-rest
               - variable-binding-list
               - initializer
         - variable-binding-pattern
 
     - match: (?=\S)
-      set: statements-in-parens
+      set:
+        - - include: for-of-rest
+          - match: (?=\S)
+            set: for-oldstyle-rest
+        - expression-end-no-in
+        - expression-begin
+
+  for-of-rest:
+    - match: (?:of|in){{identifier_break}}
+      scope: keyword.operator.word.js
+      set: expression
 
-  statements-in-parens:
+  for-oldstyle-rest:
     - match: (?=\))
       pop: true
-    - include: statements
+    - match: ;
+      scope: punctuation.separator.expression.js
+    - match: (?=\S)
+      push: expression
 
   block-scope:
     - include: block
@@ -829,6 +845,11 @@ contexts:
       pop: true
     - include: expression-end
 
+  expression-end-no-in:
+    - match: (?=in{{identifier_break}})
+      pop: true
+    - include: expression-end
+
   expression-begin:
     - include: expression-break
 
@@ -1204,15 +1225,20 @@ contexts:
     - match: '{{method_lookahead}}'
       set: method-declaration
 
-    - match: (?={{property_name}})
+    - match: |-
+        (?x)(?=
+          \#? {{identifier}}
+          \s* = \s*
+          {{either_func_lookahead}}
+        )
       set:
-        - field-initializer-or-method-declaration
-        - field-name
+        - function-initializer
+        - function-name-meta
+        - literal-variable-base
 
-    - match: (?=#{{identifier}})
+    - match: (?=#?{{property_name}})
       set:
-        - class-field-rest
-        - initializer
+        - field-initializer-or-method-declaration
         - field-name
 
     - include: else-pop
@@ -1268,7 +1294,10 @@ contexts:
     - match: 'prototype{{identifier_break}}'
       scope: support.constant.prototype.js
       pop: true
-    - include: function-declaration-single-identifier
+    - match: (?=#?{{identifier}})
+      set:
+        - function-name-meta
+        - literal-variable-base
 
   expect-dot-accessor:
     - match: '\.'
@@ -1294,39 +1323,9 @@ contexts:
       pop: true
     - include: else-pop
 
-  function-declaration-final-identifier:
-    - match: '{{dollar_only_identifier}}'
-      scope: meta.property.object.dollar.only.js punctuation.dollar.js entity.name.function.js
-      pop: true
-    - match: '{{dollar_identifier}}'
-      scope: meta.property.object.dollar.js entity.name.function.js
-      captures:
-        1: punctuation.dollar.js
-      pop: true
-    - match: '{{constant_identifier}}'
-      scope: meta.property.object.constant.js entity.name.function.js
-      pop: true
-    - match: '{{identifier}}'
-      scope: meta.property.object.readwrite.js entity.name.function.js
-      pop: true
-    - include: else-pop
-
-  function-declaration-single-identifier:
-    - match: '{{dollar_only_identifier}}'
-      scope: variable.other.dollar.only.js punctuation.dollar.js entity.name.function.js
-      pop: true
-    - match: '{{dollar_identifier}}'
-      scope: variable.other.dollar.js entity.name.function.js
-      captures:
-        1: punctuation.dollar.js
-      pop: true
-    - match: '{{constant_identifier}}'
-      scope: variable.other.constant.js entity.name.function.js
-      pop: true
-    - match: '{{identifier}}'
-      scope: variable.other.readwrite.js entity.name.function.js
-      pop: true
-    - include: else-pop
+  function-name-meta:
+    - meta_scope: entity.name.function.js
+    - include: immediately-pop
 
   either-function-declaration:
     - match: '(?={{func_lookahead}})'
@@ -1499,6 +1498,12 @@ contexts:
       scope: punctuation.separator.key-value.js
       push: expression-no-comma
 
+    # In case we're inside a destructured arrow function parameter that we
+    # misidentified as an object literal.
+    - match: '='
+      scope: keyword.operator.assignment.js
+      push: expression-no-comma
+
   bare-property-name:
     - match: '{{dollar_only_identifier}}'
       scope: meta.object-literal.key.dollar.only.js punctuation.dollar.js
@@ -1518,7 +1523,6 @@ contexts:
           pop: true
         - match: (?=\S)
           push: expression
-    - include: else-pop
 
   object-literal-meta-key:
     - meta_scope: meta.object-literal.key.js
@@ -1821,6 +1825,9 @@ contexts:
           scope: variable.other.object.js
           pop: true
 
+    - include: literal-variable-base
+
+  literal-variable-base:
     - match: '{{dollar_only_identifier}}'
       scope: variable.other.dollar.only.js punctuation.dollar.js
       pop: true
@@ -1839,6 +1846,7 @@ contexts:
       captures:
         1: punctuation.definition.variable.js
         2: variable.other.readwrite.js
+      pop: true
 
   language-identifiers:
     - match: arguments{{identifier_break}}
@@ -2224,13 +2232,18 @@ contexts:
         )
       set:
         - function-initializer
-        - function-declaration-final-identifier
+        - function-name-meta
+        - object-property-base
 
     - include: support-property
 
     - match: '(?={{identifier}}\s*\()'
       set: call-method-name
 
+    - include: object-property-base
+    - include: else-pop
+
+  object-property-base:
     - match: '{{dollar_only_identifier}}'
       scope: meta.property.object.dollar.only.js punctuation.dollar.js
       pop: true
@@ -2245,7 +2258,6 @@ contexts:
     - match: '{{identifier_part}}+{{identifier_break}}'
       scope: invalid.illegal.illegal-identifier.js
       pop: true
-    - include: else-pop
 
   support-property:
     - include: support-property-ecma