@cavelang/tree-sitter-cave 0.31.1 → 0.32.0

package/README.md

@@ -3,10 +3,12 @@
 Tree-sitter grammar for [CAVE](https://github.com/mirek/cave) — the
 canonical grammar artifact behind editor and terminal highlighting.
 
-The grammar is line-oriented (one claim per physical line, spec §16), so it
-needs no external scanner: indentation is skipped and qualifier/continuation
-lines are recognized by their leading verb. Parent attachment (spec §8) is
-semantic and left to consumers such as `@cavelang/parser`.
+The grammar is line-oriented (one claim or §8.5 shorthand fragment per
+physical line), so it needs no external scanner: indentation is skipped,
+qualifier/continuation lines are recognized by their leading verb, and a
+low-precedence shorthand fallback keeps incomplete fragments highlightable.
+Prefix expansion and parent attachment (spec §8) are semantic and left to
+consumers such as `@cavelang/parser`.
 
 Entity and attribute names accept Unicode letters, combining marks and
 numbers, with `/`, `-`, `_`, and `.` as structural characters. Numeric

package/grammar.js

@@ -22,6 +22,12 @@ module.exports = grammar({
 
   extras: () => [/[ \t]/],
 
+  conflicts: $ => [
+    [$.claim_line, $.shorthand_line, $._body],
+    [$.shorthand_line, $._body],
+    [$.claim_line, $.shorthand_line]
+  ],
+
   rules: {
     document: $ => seq(optional($._line), repeat(seq(NL, optional($._line)))),
 
@@ -29,7 +35,8 @@ module.exports = grammar({
       $.comment_line,
       $.qualifier_line,
       $.claim_line,
-      $.continuation_line
+      $.continuation_line,
+      $.shorthand_line
     ),
 
     comment_line: $ => $.comment,
@@ -42,6 +49,23 @@ module.exports = grammar({
     // Bare relational verb; the subject is inherited from the parent (§8.3).
     continuation_line: $ => prec.dynamic(-1, $._body),
 
+    // A physical fragment participating in §8.5's recursive shorthand.
+    // Indentation and prefix expansion remain consumer responsibilities;
+    // this permissive fallback keeps every fragment highlightable while the
+    // complete line rules above retain precedence.
+    shorthand_line: $ => prec.dynamic(-2, seq(
+      repeat1(choice(
+        $.verb,
+        $.attribute,
+        $._term,
+        $.number,
+        $.negation,
+        $._meta,
+        '->'
+      )),
+      optional($.comment)
+    )),
+
     _body: $ => choice(
       prec.right(seq(
         field('verb', $.verb),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cavelang/tree-sitter-cave",
-  "version": "0.31.1",
+  "version": "0.32.0",
   "description": "Tree-sitter grammar for CAVE — the canonical grammar artifact behind editor and terminal highlighting.",
   "keywords": [
     "cave",

package/src/grammar.json

@@ -61,6 +61,10 @@
         {
           "type": "SYMBOL",
           "name": "continuation_line"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "shorthand_line"
         }
       ]
     },
@@ -107,6 +111,63 @@
         "name": "_body"
       }
     },
+    "shorthand_line": {
+      "type": "PREC_DYNAMIC",
+      "value": -2,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "REPEAT1",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "verb"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "attribute"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_term"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "number"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "negation"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_meta"
+                },
+                {
+                  "type": "STRING",
+                  "value": "->"
+                }
+              ]
+            }
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
     "_body": {
       "type": "CHOICE",
       "members": [
@@ -782,7 +843,21 @@
       "value": "[ \\t]"
     }
   ],
-  "conflicts": [],
+  "conflicts": [
+    [
+      "claim_line",
+      "shorthand_line",
+      "_body"
+    ],
+    [
+      "shorthand_line",
+      "_body"
+    ],
+    [
+      "claim_line",
+      "shorthand_line"
+    ]
+  ],
   "precedences": [],
   "externals": [],
   "inline": [],

package/src/node-types.json

@@ -299,6 +299,10 @@
         {
           "type": "qualifier_line",
           "named": true
+        },
+        {
+          "type": "shorthand_line",
+          "named": true
         }
       ]
     }
@@ -477,6 +481,73 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "shorthand_line",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "attribute",
+          "named": true
+        },
+        {
+          "type": "code",
+          "named": true
+        },
+        {
+          "type": "comment",
+          "named": true
+        },
+        {
+          "type": "confidence",
+          "named": true
+        },
+        {
+          "type": "context",
+          "named": true
+        },
+        {
+          "type": "entity",
+          "named": true
+        },
+        {
+          "type": "importance",
+          "named": true
+        },
+        {
+          "type": "negation",
+          "named": true
+        },
+        {
+          "type": "number",
+          "named": true
+        },
+        {
+          "type": "sigma",
+          "named": true
+        },
+        {
+          "type": "string",
+          "named": true
+        },
+        {
+          "type": "tag",
+          "named": true
+        },
+        {
+          "type": "uncertainty",
+          "named": true
+        },
+        {
+          "type": "verb",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "tag",
     "named": true,