[JavaScript] Implemented decorators proposal. (#1483)

Author: Thomas Smith

JavaScript/JavaScript.sublime-syntax

@@ -284,6 +284,8 @@ contexts:
 
     - include: function-or-class-declaration
 
+    - include: decorator
+
     - match: (?=\S)
       set: expression-statement
 
@@ -699,6 +701,36 @@ contexts:
       set: parenthesized-expression
     - include: else-pop
 
+  decorator:
+    - match: '@'
+      scope: punctuation.definition.annotation.js
+      push:
+        - decorator-meta
+        - decorator-expression-end
+        - decorator-expression-begin
+
+  decorator-meta:
+    - meta_scope: meta.annotation.js
+    - include: immediately-pop
+
+  decorator-name:
+    - match: '{{identifier}}{{left_expression_end_lookahead}}'
+      scope: variable.annotation.js
+      pop: true
+
+  decorator-expression-end:
+    - match: \.
+      scope: punctuation.accessor.js
+      push:
+        - include: decorator-name
+        - include: object-property
+
+    - include: left-expression-end
+
+  decorator-expression-begin:
+    - include: decorator-name
+    - include: expression-begin
+
   expression-break:
     - match: (?=[;})\]])
       pop: true
@@ -1074,6 +1106,8 @@ contexts:
     - match: \;
       scope: punctuation.terminator.statement.js
 
+    - include: decorator
+
     - match: constructor{{identifier_break}}
       scope: entity.name.function.constructor.js
       push:

JavaScript/tests/syntax_test_js.js

@@ -890,6 +890,24 @@ class MyClass extends TheirClass {
     constructor$() {}
 //  ^^^^^^^^^^^^ entity.name.function - entity.name.function.constructor
 
+    @foo bar() {}
+//  ^^^^ meta.annotation
+//  ^ punctuation.definition.annotation
+//   ^^^ variable.annotation
+//       ^^^ entity.name.function
+
+    @foo.bar bar() {}
+//  ^^^^^^^^ meta.annotation
+//  ^ punctuation.definition.annotation
+//   ^^^ variable.other.object - variable.annotation
+//       ^^^ variable.annotation
+//           ^^^ entity.name.function
+
+    @(whatever) bar() {}
+//  ^^^^^^^^^^^ meta.annotation
+//  ^ punctuation.definition.annotation
+//   ^^^^^^^^^^ meta.group
+//              ^^^ entity.name.function
 
     ['foo']() {}
 //  ^^^^^^^^^ meta.function.declaration
@@ -936,6 +954,25 @@ Bar {}
 class Foo extends getSomeClass() {}
 //                ^^^^^^^^^^^^ meta.function-call variable.function - entity.other.inherited-class
 
+    @foo class Foo {}
+//  ^^^^ meta.annotation
+//  ^ punctuation.definition.annotation
+//   ^^^ variable.annotation
+//       ^^^^^ storage.type.class
+
+    @foo.bar class Foo {}
+//  ^^^^^^^^ meta.annotation
+//  ^ punctuation.definition.annotation
+//   ^^^ variable.other.object - variable.annotation
+//       ^^^ variable.annotation
+//           ^^^^^ storage.type.class
+
+    @(whatever) class Foo {}
+//  ^^^^^^^^^^^ meta.annotation
+//  ^ punctuation.definition.annotation
+//   ^^^^^^^^^^ meta.group
+//              ^^^^^ storage.type.class
+
 () => {}
 // <- meta.function.declaration punctuation.section.group.begin
  // <- meta.function.declaration punctuation.section.group.end