Update to latest from upstream

extensions/flow_types.syntax-extension

@@ -78,15 +78,15 @@ contexts:
     - include: flow-type-declare
     - include: flow-type-alias
 
-  import-item:
+  import-export-item:
     - meta_prepend: true
     - include: flow-type-import-type
 
-  import-brace:
+  import-export-brace:
     - meta_prepend: true
     - include: flow-type-import-type
 
-  export-extended:
+  export-body:
     - meta_prepend: true
     - include: flow-type-export-type
 
@@ -261,7 +261,7 @@ contexts:
   flow-type-export-type:
     - match: type{{identifier_break}}(?=\s*\{)
       scope: keyword.declaration.js
-      set: export-item
+      set: import-export-item
     - include: flow-type-alias
 
   flow-type-declare:

extensions/jsx.syntax-extension

@@ -102,14 +102,14 @@ contexts:
     - include: immediately-pop
 
   jsx-tag-attributes:
-    - meta_scope: meta.tag.attributes.js
+    - meta_content_scope: meta.tag.attributes.js
 
     - match: '>'
-      scope: punctuation.definition.tag.end.js
+      scope: meta.tag.js punctuation.definition.tag.end.js
       set: jsx-body
 
     - match: '/'
-      scope: punctuation.definition.tag.end.js
+      scope: meta.tag.js punctuation.definition.tag.end.js
       set: jsx-expect-tag-end
 
     - include: jsx-interpolation
@@ -175,7 +175,7 @@ contexts:
 
   jsx-tag-name-component:
     - match: '{{jsx_identifier}}'
-      scope: entity.name.tag.js
+      scope: entity.name.tag.component.js
       pop: 1
     - include: else-pop
 

extensions/string_object_keys.syntax-extension

@@ -3,6 +3,15 @@
 contexts:
   object-property-name:
     - meta_prepend: true
+
+    - match: (?:get|set|async){{identifier_break}}
+      scope: string.unquoted.js
+      pop: 2
+      set:
+        - match: (?=\*|{{class_element_name}})
+          fail: object-literal-property
+        - include: else-pop
+
     - match: '{{identifier_name}}'
       scope: string.unquoted.js
       pop: true