Merge pull request #218 from aspeddro/move-decorator-to-scan

Move inline decorator to scanner

Author: nkrkv

grammar.js

@@ -10,11 +10,14 @@ module.exports = grammar({
     $._template_chars,
     $._lparen,
     $._rparen,
-    $._list_constructor
+    $._list_constructor,
+    $._decorator,
+    $._decorator_inline,
   ],
 
   extras: $ => [
     $.comment,
+    $.decorator,
     /[\s\uFEFF\u2060\u200B\u00A0]/
   ],
 
@@ -77,41 +80,28 @@ module.exports = grammar({
     [$.primary_expression, $._literal_pattern],
     [$.primary_expression, $.lazy_pattern],
     [$.primary_expression, $._jsx_child],
-    [$.tuple_pattern, $.parameter],
-    [$.primary_expression, $.parameter],
-    [$.primary_expression, $.record_field],
     [$.tuple_type, $.function_type_parameter],
     [$.list, $.list_pattern],
     [$.array, $.array_pattern],
-    [$.record_field, $.record_pattern],
-    [$.expression_statement, $.ternary_expression],
     [$.type_declaration],
-    [$.type_binding],
     [$.let_declaration],
-    [$.let_declaration, $.ternary_expression],
     [$.variant_identifier, $.module_identifier],
     [$.variant, $.variant_pattern],
-    [$.variant_declaration, $.function_type_parameter],
     [$.variant_arguments, $._variant_pattern_parameters],
     [$.polyvar, $.polyvar_pattern],
     [$._pattern],
-    [$._record_element, $.jsx_expression],
     [$._record_element, $._record_single_field],
     [$._record_pun_field, $._record_single_pun_field],
     [$._record_field_name, $.record_pattern],
-    [$.decorator],
     [$._statement, $._one_or_more_statements],
     [$._inline_type, $.function_type_parameters],
     [$.primary_expression, $.parameter, $._pattern],
     [$.parameter, $._pattern],
     [$.parameter, $.parenthesized_pattern],
     [$.parameter, $.tuple_item_pattern],
-    [$.variant_declaration],
     [$.unit, $._function_type_parameter_list],
     [$.functor_parameter, $.module_primary_expression, $.module_identifier_path],
     [$._reserved_identifier, $.function],
-    [$.polyvar_type],
-    [$.let_binding, $.or_pattern],
     [$.exception_pattern, $.or_pattern],
     [$.type_binding, $._inline_type],
     [$._module_structure, $.parenthesized_module_expression]
@@ -141,28 +131,12 @@ module.exports = grammar({
     ),
 
     statement: $ => choice(
-      alias($._decorated_statement, $.decorated),
-      $.decorator_statement,
       $.expression_statement,
       $.declaration,
       $.open_statement,
       $.include_statement,
     ),
 
-    _decorated_statement: $ => seq(
-      repeat1($.decorator),
-      choice(
-        $.declaration,
-        $.expression_statement
-      )
-    ),
-
-    decorator_statement: $ => seq(
-      '@@',
-      $.decorator_identifier,
-      optional($.decorator_arguments)
-    ),
-
     block: $ => prec.right(seq(
       '{',
       optional($._one_or_more_statements),
@@ -282,7 +256,7 @@ module.exports = grammar({
       'type',
       optional('rec'),
       sep1(
-        seq(repeat($._newline), repeat($.decorator), 'and'),
+        seq(repeat($._newline), 'and'),
         $.type_binding
       )
     ),
@@ -314,7 +288,6 @@ module.exports = grammar({
 
     type_annotation: $ => seq(
       ':',
-      repeat($.decorator),
       $._inline_type,
     ),
 
@@ -367,7 +340,6 @@ module.exports = grammar({
     )),
 
     variant_declaration: $ => prec.right(seq(
-      repeat($.decorator),
       $.variant_identifier,
       optional($.variant_parameters),
       optional($.type_annotation),
@@ -380,7 +352,6 @@ module.exports = grammar({
     ),
 
     polyvar_type: $ => prec.left(seq(
-      repeat($.decorator),
       choice('[', '[>', '[<',),
       optional('|'),
       barSep1($.polyvar_declaration),
@@ -390,7 +361,6 @@ module.exports = grammar({
     polyvar_declaration: $ => prec.right(
       choice(
         seq(
-          repeat($.decorator),
           $.polyvar_identifier,
           optional($.polyvar_parameters),
         ),
@@ -411,7 +381,6 @@ module.exports = grammar({
     ),
 
     record_type_field: $ => seq(
-      repeat($.decorator),
       optional('mutable'),
       alias($.value_identifier, $.property_identifier),
       optional('?'),
@@ -433,7 +402,6 @@ module.exports = grammar({
     object_type_field: $ => choice(
       seq('...', choice($.type_identifier, $.type_identifier_path)),
       seq(
-        repeat($.decorator),
         alias($.string, $.property_identifier),
         ':',
         $._type,
@@ -471,7 +439,6 @@ module.exports = grammar({
 
     function_type_parameter: $ => seq(
       optional($.uncurry),
-      repeat($.decorator),
       choice(
         $._type,
         seq($.uncurry, $._type),
@@ -483,7 +450,7 @@ module.exports = grammar({
       choice('export', 'let'),
       optional('rec'),
       sep1(
-        seq(repeat($._newline), repeat($.decorator), 'and'),
+        seq(repeat($._newline), 'and'),
         $.let_binding
       )
     ),
@@ -495,14 +462,12 @@ module.exports = grammar({
           $.type_annotation,
           optional(
             seq('=',
-              repeat($.decorator),
               field('body', $.expression)
             )
           )
         ),
         seq(
           '=',
-          repeat($.decorator),
           field('body', $.expression),
         )
       )
@@ -559,7 +524,6 @@ module.exports = grammar({
 
     parenthesized_expression: $ => seq(
       '(',
-      repeat($.decorator),
       $.expression,
       optional($.type_annotation),
       ')'
@@ -578,7 +542,6 @@ module.exports = grammar({
         $._definition_signature
       ),
       '=>',
-      repeat($.decorator),
       field('body', $.expression),
     )),
 
@@ -647,27 +610,21 @@ module.exports = grammar({
     tuple: $ => seq(
       '(',
       commaSep2t(
-        seq(repeat($.decorator), $.expression)
+        $.expression
       ),
       ')',
     ),
 
     array: $ => seq(
       '[',
-      commaSept(
-        seq(repeat($.decorator), $.expression)
-      ),
+      commaSept($.expression),
       ']'
     ),
 
     list: $ => seq(
       $._list_constructor,
       '{',
-      optional(
-        commaSep1t(
-          seq(repeat($.decorator), $._list_element)
-        )
-      ),
+      optional(commaSep1t($._list_element)),
       '}'
     ),
 
@@ -773,7 +730,6 @@ module.exports = grammar({
 
     _call_argument: $ => choice(
       seq(
-        repeat($.decorator),
         $.expression,
         optional($.type_annotation),
       ),
@@ -788,7 +744,6 @@ module.exports = grammar({
         seq(
           '=',
           optional('?'),
-          repeat($.decorator),
           field('value', $.expression),
           optional(field('type', $.type_annotation)),
         ),
@@ -933,7 +888,6 @@ module.exports = grammar({
     ),
 
     tuple_item_pattern: $ => seq(
-      repeat($.decorator),
       $._pattern,
       optional($.type_annotation),
     ),
@@ -947,17 +901,15 @@ module.exports = grammar({
     array_pattern: $ => seq(
       '[',
       optional(commaSep1t(
-        seq(repeat($.decorator), $._collection_element_pattern)
+        $._collection_element_pattern
       )),
       ']',
     ),
 
     list_pattern: $ => seq(
       $._list_constructor,
       '{',
-      optional(commaSep1t(
-        seq(repeat($.decorator), $._collection_element_pattern)
-      )),
+      optional(commaSep1t($._collection_element_pattern)),
       '}',
     ),
 
@@ -1089,10 +1041,9 @@ module.exports = grammar({
       $.expression,
     ),
 
-    decorator: $ => seq(
-      '@',
-      $.decorator_identifier,
-      optional($.decorator_arguments)
+    decorator: $ => choice(
+      alias($._decorator_inline, $.decorator_identifier),
+      seq(alias($._decorator, $.decorator_identifier), $.decorator_arguments)
     ),
 
     decorator_arguments: $ => seq(
@@ -1365,8 +1316,6 @@ module.exports = grammar({
 
     module_identifier: $ => /[A-Z][a-zA-Z0-9_']*/,
 
-    decorator_identifier: $ => /[a-zA-Z0-9_\.]+/,
-
     extension_identifier: $ => /[a-zA-Z0-9_\.]+/,
 
     number: $ => {

queries/highlights.scm

@@ -80,11 +80,7 @@
 ; Meta
 ;-----
 
-[
- "@"
- "@@"
- (decorator_identifier)
-] @annotation
+(decorator_identifier) @annotation
 
 (extension_identifier) @keyword
 ("%") @keyword