@konomanoasa/tree-sitter-gitattributes 0.5.0 → 0.6.0

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "konomanoasa-tree-sitter-gitattributes"
-version = "0.5.0"
+version = "0.6.0"
 description = "Tree-sitter grammar for gitattributes."
 readme = "README.md"
 license = "MIT"

package/grammar.js

@@ -1,3 +1,72 @@
+const missingKinds = (name) => [
+  [`missing_${name}`, "invalid_syntax", `missing_${name}`],
+  [`incomplete_${name}`, "incomplete_syntax", `missing_${name}`],
+];
+const issueKinds = [
+  ...missingKinds("set_close"),
+  ["invalid_encoding", "invalid_syntax", "invalid_encoding"],
+  ["negative_pattern", "invalid_syntax", "negative_pattern"],
+  ["ended_escape", "invalid_syntax", "incomplete_escape"],
+  ["incomplete_escape", "incomplete_syntax", "incomplete_escape"],
+  ["invalid_quoted_escape", "invalid_syntax", "invalid_quoted_escape"],
+  ["ended_quoted_escape", "invalid_syntax", "incomplete_quoted_escape"],
+  ["incomplete_quoted_escape", "incomplete_syntax", "incomplete_quoted_escape"],
+  ...missingKinds("quote_close"),
+  [
+    "missing_attribute_separator",
+    "invalid_syntax",
+    "missing_attribute_separator",
+  ],
+  ...missingKinds("attribute_name"),
+  ["invalid_name_character", "invalid_syntax", "invalid_name_character"],
+  ["incomplete_name_character", "incomplete_syntax", "invalid_name_character"],
+  [
+    "invalid_name_escape",
+    "invalid_syntax",
+    "invalid_name_character",
+    "quoted_escape",
+  ],
+];
+const quotedEscapeIssues = [
+  "invalid_quoted_escape",
+  "ended_quoted_escape",
+  "incomplete_quoted_escape",
+];
+
+const issueRules = Object.fromEntries(
+  issueKinds.flatMap(([token, outcome, reason, child]) => [
+    ...(child
+      ? [[`_${token}_reason`, ($) => alias($[`_${token}`], $[child])]]
+      : []),
+    [
+      `_${token}_outcome`,
+      ($) => alias($[child ? `_${token}_reason` : `_${token}`], $[reason]),
+    ],
+    [`_${token}_issue`, ($) => alias($[`_${token}_outcome`], $[outcome])],
+  ]),
+);
+const issue = ($, name) =>
+  field("issue", alias($[`_${name}_issue`], $.syntax_issue));
+const issues = ($, ...names) => names.map((name) => issue($, name));
+const missing = ($, name) =>
+  choice(issue($, `missing_${name}`), issue($, `incomplete_${name}`));
+const heldPrefix = ($, ...names) =>
+  seq($._escape_prefix, choice(...issues($, ...names)));
+const quoteClose = ($) =>
+  optional(choice(field("closing", $.quote_close), missing($, "quote_close")));
+const attributeName = ($) =>
+  choice(field("name", $.attribute_name), missing($, "attribute_name"));
+const globIssues = ($) => [
+  ...issues(
+    $,
+    "invalid_encoding",
+    "ended_escape",
+    "incomplete_escape",
+    ...quotedEscapeIssues,
+  ),
+  heldPrefix($, "invalid_encoding", ...quotedEscapeIssues),
+];
+
 export default grammar({
   name: "gitattributes",
   externals: ($) => [
@@ -7,6 +76,7 @@ export default grammar({
     $._rule_start,
     $._macro_start,
     $._eof,
+    $.line_ending,
     $._layout,
     $._separator,
     $._attribute_start,
@@ -35,6 +105,7 @@ export default grammar({
     $.path_separator,
     $.escape,
     $.quoted_escape,
+    $._escape_prefix,
     $.set_open,
     $.set_negation,
     $.set_text,
@@ -47,52 +118,59 @@ export default grammar({
     $._class_open,
     $.class_name,
     $._class_close,
+    ...issueKinds.map(([name]) => $[`_${name}`]),
     $._error_sentinel,
   ],
-  extras: () => [],
+  extras: ($) => [$._unmatchable],
   rules: {
-    document: ($) => repeat($._line),
-    _line: ($) =>
-      seq(
-        $._line_start,
-        choice($.blank_line, $.comment, $.attribute_rule, $.macro_definition),
+    document: ($) =>
+      repeat(
+        seq(
+          $._line_start,
+          choice($.blank_line, $.comment, $.attribute_rule, $.macro_definition),
+        ),
       ),
-    line_ending: () => /\r?\n/,
+    _unmatchable: () => token(seq(/[\s\S]/, /[^\s\S]/)),
     _end: ($) => seq(optional($._layout), choice($.line_ending, $._eof)),
     blank_line: ($) => seq($._blank_start, $._end),
     comment: ($) =>
-      seq($._comment_start, $.comment_marker, optional($.comment_text), $._end),
+      seq(
+        $._comment_start,
+        $.comment_marker,
+        repeat(choice($.comment_text, issue($, "invalid_encoding"))),
+        $._end,
+      ),
     attribute_rule: ($) =>
       seq(
         $._rule_start,
         field("pattern", $.pattern),
-        repeat($._attribute),
+        optional($._attributes),
         $._end,
       ),
     macro_definition: ($) =>
       seq(
         $._macro_start,
-        choice(
-          $._macro_name,
-          seq(
-            field("opening", $.quote_open),
-            $._macro_name,
-            field("closing", $.quote_close),
-          ),
-        ),
-        repeat($._attribute),
+        optional(field("opening", $.quote_open)),
+        field("marker", $.macro_marker),
+        attributeName($),
+        quoteClose($),
+        optional($._attributes),
         $._end,
       ),
-    _macro_name: ($) =>
-      seq(field("marker", $.macro_marker), field("name", $.attribute_name)),
-    _attribute: ($) => seq($._separator, $.attribute),
+    _attributes: ($) =>
+      repeat1(
+        seq(
+          choice($._separator, issue($, "missing_attribute_separator")),
+          $.attribute,
+        ),
+      ),
     attribute: ($) =>
       seq(
         $._attribute_start,
         optional(
           field("modifier", choice($.unset_marker, $.unspecified_marker)),
         ),
-        field("name", $.attribute_name),
+        attributeName($),
         optional(
           seq(
             field("operator", $.assignment_operator),
@@ -104,56 +182,73 @@ export default grammar({
     attribute_name: ($) =>
       seq(
         $._name_start,
-        repeat1(choice($.name_text, $.quoted_escape)),
+        repeat1(
+          choice(
+            $.name_text,
+            $.quoted_escape,
+            ...issues(
+              $,
+              "invalid_encoding",
+              "invalid_name_character",
+              "incomplete_name_character",
+              "invalid_name_escape",
+              ...quotedEscapeIssues,
+            ),
+            heldPrefix($, "invalid_encoding"),
+          ),
+        ),
         $._name_end,
       ),
-    attribute_value: ($) => seq($._value_start, $.value_text, $._value_end),
-    pattern: ($) =>
+    attribute_value: ($) =>
       seq(
-        choice(
-          repeat1($._glob),
-          seq(
-            field("opening", $.quote_open),
-            repeat($._glob),
-            field("closing", $.quote_close),
-          ),
-        ),
-        $._pattern_end,
+        $._value_start,
+        repeat1(choice($.value_text, issue($, "invalid_encoding"))),
+        $._value_end,
       ),
-    _glob: ($) =>
-      choice(
-        $.glob_literal,
-        seq(
-          $._glob_start,
+    pattern: ($) =>
+      seq(
+        optional(field("opening", $.quote_open)),
+        repeat(
           choice(
-            $.wildcard,
-            $.recursive_wildcard,
-            $.single_character,
-            $.path_separator,
-            $.escape,
-            $.quoted_escape,
-            $.character_set,
+            $.glob_literal,
+            seq(
+              $._glob_start,
+              choice(
+                $.wildcard,
+                $.recursive_wildcard,
+                $.single_character,
+                $.path_separator,
+                $.escape,
+                $.quoted_escape,
+                $.character_set,
+                issue($, "negative_pattern"),
+                ...globIssues($),
+              ),
+            ),
           ),
         ),
+        quoteClose($),
+        $._pattern_end,
       ),
     glob_literal: ($) => $._literal,
     character_set: ($) =>
       seq(
         field("opening", $.set_open),
         optional(field("negation", $.set_negation)),
-        repeat($._set_item),
-        field("closing", $.set_close),
-      ),
-    _set_item: ($) =>
-      seq(
-        $._set_item_start,
-        choice(
-          $.set_text,
-          $.escape,
-          $.quoted_escape,
-          $.character_range,
-          $.character_class,
+        repeat(
+          seq(
+            $._set_item_start,
+            choice(
+              $.set_text,
+              $.escape,
+              $.quoted_escape,
+              $.character_range,
+              $.character_class,
+              ...globIssues($),
+            ),
+          ),
         ),
+        choice(field("closing", $.set_close), missing($, "set_close")),
       ),
     character_range: ($) =>
       seq(
@@ -167,10 +262,21 @@ export default grammar({
       seq(
         alias($._compound_open, "["),
         alias($._class_open, ":"),
-        repeat($._class_piece),
+        repeat(
+          choice(
+            field("name", choice($.class_name, $.quoted_escape)),
+            ...issues(
+              $,
+              "invalid_encoding",
+              "invalid_quoted_escape",
+              "ended_quoted_escape",
+            ),
+            heldPrefix($, "invalid_encoding"),
+          ),
+        ),
         alias($._class_close, ":"),
         alias($._compound_close, "]"),
       ),
-    _class_piece: ($) => field("name", choice($.class_name, $.quoted_escape)),
+    ...issueRules,
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomanoasa/tree-sitter-gitattributes",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Tree-sitter grammar for gitattributes.",
   "license": "MIT",
   "repository": "git+https://github.com/konomanoasa/tree-sitter-gitattributes.git",

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "konomanoasa-tree-sitter-gitattributes"
-version = "0.5.0"
+version = "0.6.0"
 description = "Tree-sitter grammar for gitattributes."
 readme = "README.md"
 license = "MIT"