tree-sitter-bynk 0.508.4 → 0.510.18

package/README.md

@@ -6,7 +6,7 @@ The [tree-sitter](https://tree-sitter.github.io/tree-sitter/) grammar for the
 [Bynk](https://github.com/bynk-lang/bynk) language — the source of truth for
 tree-sitter syntax highlighting (`queries/highlights.scm`), the playground's
 editor, and the Book's grammar reference (rendered from `src/grammar.json` by
-[`bynk-grammar`](https://crates.io/crates/bynk-grammar)).
+`bynk-tests`'s `grammar` module, formerly the `bynk-grammar` crate, whose [last crates.io release](https://crates.io/crates/bynk-grammar) points here).
 
 This directory is **two things**:
 

package/grammar.js

@@ -39,7 +39,15 @@ const PREC = {
 module.exports = grammar({
   name: "bynk",
 
-  externals: ($) => [$.doc_block, $.doc_line, $.raw_string, $._type_app_open, $._error_sentinel],
+  externals: ($) => [
+    $.doc_block,
+    $.doc_line,
+    $._raw_string_line,
+    $._raw_triple_open,
+    $.raw_string_body,
+    $._type_app_open,
+    $._error_sentinel,
+  ],
 
   extras: ($) => [/\s+/, $.doc_line, $.line_comment, $.doc_block],
 
@@ -2226,24 +2234,51 @@ module.exports = grammar({
           '"',
         ),
         // #2619: a multi-line string. The opening `"""` is followed by a
-        // newline; the body may hold lone or doubled quotes; escapes and
-        // interpolation are those of an ordinary string. (Indentation stripping
-        // is a value rule, not a shape: the compiler checks it.)
+        // newline, or (#2958) by a language tag and a newline; the body may
+        // hold lone or doubled quotes; escapes and interpolation are those of
+        // an ordinary string. (Indentation stripping is a value rule, not a
+        // shape: the compiler checks it.)
+        seq('"""', $._multiline_opener_rest, optional($.string_body), '"""'),
+        // #2619: a raw string (`r"…"`, `r#"…"#`, `r"""…"""`): no escapes, no
+        // interpolation.
+        $.raw_string,
+      ),
+    // #2958: the rest of a multi-line string's opening line: a newline, or a
+    // language tag, optional spaces or tabs, and a newline. No space may come
+    // between the `"""` and the tag.
+    _multiline_opener_rest: ($) =>
+      choice(
+        token.immediate(/\r?\n/),
+        seq(field("tag", $.string_tag), token.immediate(/[ \t]*\r?\n/)),
+      ),
+    // #2958: a multi-line string's language tag (`sql` in `"""sql`): editor
+    // metadata naming the language of the body, for `injections.scm`. It is
+    // not part of the value.
+    string_tag: () => token.immediate(/[a-z][a-z0-9_-]*/),
+    // #2958: a multi-line string's body, a node of its own so an injection
+    // can name it. Interpolation holes and escapes are its children.
+    string_body: ($) =>
+      repeat1(
+        choice(
+          token.immediate(prec(1, /[^"\\]+/)),
+          token.immediate(prec(1, /"{1,2}[^"\\]/)),
+          $.escape_sequence,
+          $.string_interpolation,
+        ),
+      ),
+    // #2619: a raw string. Single-line forms are one external token (the `#`
+    // count is not regular); the multi-line form (#2958) is an external
+    // opener `r"""`, the opening line's rest, an external opaque body, and
+    // the closing `"""`, so the tag and body are nodes of their own.
+    raw_string: ($) =>
+      choice(
+        $._raw_string_line,
         seq(
-          token(/"""\r?\n/),
-          repeat(
-            choice(
-              token.immediate(prec(1, /[^"\\]+/)),
-              token.immediate(prec(1, /"{1,2}[^"\\]/)),
-              $.escape_sequence,
-              $.string_interpolation,
-            ),
-          ),
+          $._raw_triple_open,
+          $._multiline_opener_rest,
+          optional($.raw_string_body),
           '"""',
         ),
-        // #2619: a raw string (`r"…"`, `r#"…"#`, `r"""…"""`): no escapes, no
-        // interpolation. An external token — the `#` count is not regular.
-        $.raw_string,
       ),
     // `\n \t \r \0 \" \\` and `\u{1–6 hex digits}` (#2619). Whether a `\u{…}`
     // names a scalar value (not a surrogate, at most 10FFFF) is the compiler's

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-bynk",
-  "version": "0.508.4",
+  "version": "0.510.18",
   "description": "Tree-sitter grammar for the Bynk language.",
   "main": "bindings/node",
   "types": "bindings/node",

package/queries/highlights.scm

@@ -237,6 +237,8 @@
 (string_literal) @string
 ; #2619: an escape inside a string; a raw string has none.
 (escape_sequence) @string.escape
+; #2958: a multi-line string's language tag is metadata, not string text.
+(string_tag) @attribute
 (number_literal) @number
 (float_literal) @number
 (decimal_literal) @number

package/queries/injections.scm

@@ -1 +1,13 @@
-; No language injections currently; doc-block contents are plain text.
+; #2958: a multi-line string's language tag (`"""sql`, `r"""regex`) names the
+; language of its body. The body is injected as that language; interpolation
+; holes and escapes are children of the body, so they are left out of the
+; injected text. A tag no editor knows is a plain string.
+; Doc-block contents are plain text.
+
+((string_literal
+   (string_tag) @injection.language
+   (string_body) @injection.content))
+
+((raw_string
+   (string_tag) @injection.language
+   (raw_string_body) @injection.content))

package/src/grammar.json

@@ -10614,49 +10614,24 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "TOKEN",
-              "content": {
-                "type": "PATTERN",
-                "value": "\"\"\"\\r?\\n"
-              }
+              "type": "STRING",
+              "value": "\"\"\""
             },
             {
-              "type": "REPEAT",
-              "content": {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "IMMEDIATE_TOKEN",
-                    "content": {
-                      "type": "PREC",
-                      "value": 1,
-                      "content": {
-                        "type": "PATTERN",
-                        "value": "[^\"\\\\]+"
-                      }
-                    }
-                  },
-                  {
-                    "type": "IMMEDIATE_TOKEN",
-                    "content": {
-                      "type": "PREC",
-                      "value": 1,
-                      "content": {
-                        "type": "PATTERN",
-                        "value": "\"{1,2}[^\"\\\\]"
-                      }
-                    }
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "escape_sequence"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "string_interpolation"
-                  }
-                ]
-              }
+              "type": "SYMBOL",
+              "name": "_multiline_opener_rest"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "string_body"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             },
             {
               "type": "STRING",
@@ -10670,6 +10645,121 @@
         }
       ]
     },
+    "_multiline_opener_rest": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "IMMEDIATE_TOKEN",
+          "content": {
+            "type": "PATTERN",
+            "value": "\\r?\\n"
+          }
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "tag",
+              "content": {
+                "type": "SYMBOL",
+                "name": "string_tag"
+              }
+            },
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "PATTERN",
+                "value": "[ \\t]*\\r?\\n"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "string_tag": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "[a-z][a-z0-9_-]*"
+      }
+    },
+    "string_body": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "IMMEDIATE_TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 1,
+              "content": {
+                "type": "PATTERN",
+                "value": "[^\"\\\\]+"
+              }
+            }
+          },
+          {
+            "type": "IMMEDIATE_TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 1,
+              "content": {
+                "type": "PATTERN",
+                "value": "\"{1,2}[^\"\\\\]"
+              }
+            }
+          },
+          {
+            "type": "SYMBOL",
+            "name": "escape_sequence"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "string_interpolation"
+          }
+        ]
+      }
+    },
+    "raw_string": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_raw_string_line"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_raw_triple_open"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_multiline_opener_rest"
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "raw_string_body"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": "\"\"\""
+            }
+          ]
+        }
+      ]
+    },
     "escape_sequence": {
       "type": "IMMEDIATE_TOKEN",
       "content": {
@@ -10821,7 +10911,15 @@
     },
     {
       "type": "SYMBOL",
-      "name": "raw_string"
+      "name": "_raw_string_line"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "_raw_triple_open"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "raw_string_body"
     },
     {
       "type": "SYMBOL",

package/src/node-types.json

@@ -9392,6 +9392,32 @@
       ]
     }
   },
+  {
+    "type": "raw_string",
+    "named": true,
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "string_tag",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "raw_string_body",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "record_construction",
     "named": true,
@@ -11495,6 +11521,25 @@
       ]
     }
   },
+  {
+    "type": "string_body",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "escape_sequence",
+          "named": true
+        },
+        {
+          "type": "string_interpolation",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "string_interpolation",
     "named": true,
@@ -11637,7 +11682,18 @@
   {
     "type": "string_literal",
     "named": true,
-    "fields": {},
+    "fields": {
+      "tag": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "string_tag",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": false,
@@ -11650,6 +11706,10 @@
           "type": "raw_string",
           "named": true
         },
+        {
+          "type": "string_body",
+          "named": true
+        },
         {
           "type": "string_interpolation",
           "named": true
@@ -14096,7 +14156,7 @@
     "named": false
   },
   {
-    "type": "raw_string",
+    "type": "raw_string_body",
     "named": true
   },
   {
@@ -14147,6 +14207,10 @@
     "type": "store",
     "named": false
   },
+  {
+    "type": "string_tag",
+    "named": true
+  },
   {
     "type": "stub",
     "named": false