Merge pull request #1484 from Thom1729/javascript-import-meta

[JavaScript] Implement `import.meta` proposal.

Author: wbond

JavaScript/JavaScript.sublime-syntax

@@ -104,12 +104,19 @@ contexts:
       scope: punctuation.separator.comma.js
 
   import-export:
-    - match: import{{identifier_break}}
+    - match: import{{identifier_break}}(?!\s*\.)
       scope: keyword.control.import-export.js
       set:
-        - import-meta
-        - expect-semicolon
-        - import-string-or-items
+        - meta_scope: meta.import.js
+        - match: (?=\.) # Recovery for import.meta
+          set:
+            - expression-statement-end
+            - import-meta-expression-dot
+        - match: (?=\S)
+          set:
+            - import-meta
+            - expect-semicolon
+            - import-string-or-items
 
     - match: export{{identifier_break}}
       scope: keyword.control.import-export.js
@@ -748,6 +755,7 @@ contexts:
     - include: prefix-operators
     - include: yield-expression
     - include: await-expression
+    - include: import-meta-expression
 
     - include: class
     - include: constants
@@ -1899,3 +1907,18 @@ contexts:
       scope: invalid.illegal.illegal-identifier.js
       pop: true
     - include: else-pop
+
+  import-meta-expression:
+    - match: import{{identifier_break}}
+      scope: variable.language.import.js
+      set: import-meta-expression-dot
+
+  import-meta-expression-dot:
+    - match: \.
+      scope: punctuation.accessor.js
+      set:
+        - match: meta{{identifier_break}}
+          scope: variable.language.import.js
+          pop: true
+        - include: object-property
+    - include: else-pop

JavaScript/tests/syntax_test_js.js

@@ -180,6 +180,24 @@ export default$
 //     ^^^^^^^^ - keyword
 ;
 
+let x = import.meta;
+//      ^^^^^^^^^^^ - meta.import
+//      ^^^^^^ variable.language.import
+//            ^ punctuation.accessor
+//             ^^^^ variable.language.import
+
+    import.meta;
+//  ^^^^^^^^^^^ - meta.import
+//  ^^^^^^ variable.language.import
+//        ^ punctuation.accessor
+//         ^^^^ variable.language.import
+
+    import
+    .meta;
+//  ^^^^^ - meta.import
+//  ^ punctuation.accessor
+//   ^^^^ variable.language.import
+
 // This object literal is technically broken since foo() does not have a
 // method body, but we include it here to ensure that highlighting is not
 // broken as the user is typing