simplify attributes

grammar.js

@@ -100,6 +100,7 @@ module.exports = grammar({
     $._record_type_defn_inner,
     $._union_type_defn_inner,
     $._then_expression,
+    $._attribute_target,
   ],
 
   supertypes: ($) => [
@@ -188,17 +189,17 @@ module.exports = grammar({
     //
     // Attributes (BEGIN)
     //
-    attributes: ($) => prec.left(repeat1($.attribute_set)),
-    attribute_set: ($) =>
+    attributes: ($) => prec.left(repeat1($._attribute_set)),
+    _attribute_set: ($) =>
       seq(
         "[<",
         $.attribute,
         prec(PREC.SEQ_EXPR + 1, repeat(seq($._newline, $.attribute))),
         ">]",
       ),
     attribute: ($) =>
-      seq(optional(seq($.attribute_target, ":")), $.object_construction),
-    attribute_target: (_) =>
+      seq(optional(seq($._attribute_target, ":")), $._object_construction),
+    _attribute_target: (_) =>
       choice(
         "assembly",
         "module",
@@ -211,7 +212,7 @@ module.exports = grammar({
         "event",
       ),
 
-    object_construction: ($) =>
+    _object_construction: ($) =>
       prec.left(PREC.SEQ_EXPR + 1, seq($.type, optional($._expression))),
 
     //
@@ -529,7 +530,7 @@ module.exports = grammar({
       prec(PREC.NEW_EXPR, seq("new", $._base_call, $._object_expression_inner)),
 
     _base_call: ($) =>
-      seq($.object_construction, optional(seq("as", $.identifier))),
+      seq($._object_construction, optional(seq("as", $.identifier))),
 
     prefixed_expression: ($) =>
       seq(

queries/highlights.scm

@@ -16,14 +16,13 @@
 
 (primary_constr_args (_) @variable.parameter)
 
+(class_as_reference
+  (_) @variable.parameter.builtin)
+
+
 ((identifier_pattern (long_identifier (identifier) @character.special))
  (#match? @character.special "^\_.*"))
 
-((long_identifier
-  (identifier)+
-  .
-  (identifier) @variable.member))
-
 ;; ----------------------------------------------------------------------------
 ;; Punctuation
 
@@ -60,6 +59,9 @@
   .
   (_) @variable)
 
+(optional_pattern
+  "?" @character.special)
+
 (fsi_directive_decl . (string) @module)
 
 (import_decl . (_) @module)
@@ -84,17 +86,13 @@
     (identifier) @property))
 
 (dot_expression
-  base: (_) @module
-  field: (_) @variable.member)
+  base: (_)? @module)
 
 (value_declaration_left . (_) @variable)
 
 (function_declaration_left
   . (_) @function
-  [
-    (argument_patterns)
-    (argument_patterns (long_identifier (identifier)))
-  ] @variable.parameter)
+  . (_)* @variable_parameter)
 
 (member_defn
   (method_or_prop_defn
@@ -108,14 +106,7 @@
 
 (application_expression
   .
-  [
-    (long_identifier_or_op [
-      (long_identifier (identifier)* (identifier) @function.call)
-      (identifier) @function.call
-    ])
-    (typed_expression . (long_identifier_or_op (long_identifier (identifier)* . (identifier) @function.call)))
-    (dot_expression base: (_) @variable.member field: (_) @function.call)
-  ] @function.call)
+  (_) @function.call)
 
 ((infix_expression
   .
@@ -170,6 +161,9 @@
 
 (compiler_directive_decl) @keyword.directive
 
+(preproc_line
+  "#line" @keyword.directive)
+
 (attribute) @attribute
 
 [
@@ -183,9 +177,12 @@
   "|]"
   "{|"
   "|}"
+] @punctuation.bracket
+
+[
   "[<"
   ">]"
-] @punctuation.bracket
+] @punctuation.special
 
 (format_string_eval
   [
@@ -279,17 +276,11 @@
   "type"
   "inherit"
   "interface"
-  "struct"
+  "and"
   "class"
+  "struct"
 ] @keyword.type
 
-(try_expression
-  [
-    "try"
-    "with"
-    "finally"
-  ] @keyword.exception)
-
 ((identifier) @keyword.exception
  (#any-of? @keyword.exception "failwith" "failwithf" "raise" "reraise"))
 
@@ -327,6 +318,13 @@
 
 (match_expression "with" @keyword.conditional)
 
+(try_expression
+  [
+    "try"
+    "with"
+    "finally"
+  ] @keyword.exception)
+
 ((type
   (long_identifier (identifier) @type.builtin))
  (#any-of? @type.builtin "bool" "byte" "sbyte" "int16" "uint16" "int" "uint" "int64" "uint64" "nativeint" "unativeint" "decimal" "float" "double" "float32" "single" "char" "string" "unit"))
@@ -346,8 +344,19 @@
   .
   (identifier)))
 
-(long_identifier_or_op
-  (op_identifier) @operator)
+(op_identifier) @operator
 
 ((identifier) @module.builtin
  (#any-of? @module.builtin "Array" "Async" "Directory" "File" "List" "Option" "Path" "Map" "Set" "Lazy" "Seq" "Task" "String" "Result" ))
+
+((value_declaration
+   (attributes
+     (attribute
+       (type
+         (long_identifier
+           (identifier) @attribute_name))))
+   (function_or_value_defn
+     (value_declaration_left
+       .
+       (_) @constant)))
+ (#eq? @attribute_name "Literal"))