grammar: inline expression and solve conflicts

Author: leostera

grammar.js

@@ -112,9 +112,17 @@ module.exports = grammar({
 
   extras: ($) => [/[\x00-\x20\x80-\xA0]/, $.comment],
 
-  inline: ($) => [$.term],
-
-  conflicts: ($) => [],
+  inline: ($) => [$.term, $.expression],
+
+  conflicts: ($) => [
+    [$._structure_item, $.expr_operator_binary],
+    [
+      $._structure_item,
+      $.expr_map_update,
+      $.expr_record_access,
+      $.expr_record_update,
+    ],
+  ],
 
   rules: {
     source_file: ($) => repeat($._structure_item),
@@ -405,7 +413,7 @@ module.exports = grammar({
     expr_op: ($) => choice($.expr_operator_unary, $.expr_operator_binary),
 
     expr_operator_unary: ($) =>
-      prec(
+      prec.right(
         PREC.UNARY_OP,
         seq(field("operator", oneOf(OP1)), field("operand", $.expression))
       ),

src/grammar.json

@@ -2097,7 +2097,7 @@
       ]
     },
     "expr_operator_unary": {
-      "type": "PREC",
+      "type": "PREC_RIGHT",
       "value": 10,
       "content": {
         "type": "SEQ",
@@ -3918,10 +3918,22 @@
       "name": "comment"
     }
   ],
-  "conflicts": [],
+  "conflicts": [
+    [
+      "_structure_item",
+      "expr_operator_binary"
+    ],
+    [
+      "_structure_item",
+      "expr_map_update",
+      "expr_record_access",
+      "expr_record_update"
+    ]
+  ],
   "externals": [],
   "inline": [
-    "term"
+    "term",
+    "expression"
   ],
   "supertypes": []
 }