fix: rewrite text, eol, and comment

Trevor: resolve conflicts, reformat C with existing style. This change
includes a new XFAIL test, but fixes several others.

grammar.js

@@ -35,7 +35,17 @@ function array(item) {
 
 module.exports = grammar({
   name: "just",
-  externals: ($) => [$._indent, $._dedent, $._newline],
+
+  externals: ($) => [
+    $._indent,
+    $._dedent,
+    $._newline,
+    $.text,
+    $.error_recovery,
+  ],
+
+  extras: ($) => [$.comment, /\s/],
+
   inline: ($) => [
     $._string,
     $._string_indented,
@@ -56,7 +66,6 @@ module.exports = grammar({
     //               | import
     //               | module
     //               | setting
-    //               | eol
     item: ($) =>
       choice(
         $.recipe,
@@ -66,13 +75,8 @@ module.exports = grammar({
         $.import,
         $.module,
         $.setting,
-        $._eol,
       ),
 
-    // eol           : NEWLINE
-    //               | COMMENT NEWLINE
-    _eol: ($) => choice($._newline, $.comment),
-
     // alias         : 'alias' NAME ':=' NAME
     alias: ($) =>
       seq(
@@ -81,14 +85,13 @@ module.exports = grammar({
         ":=",
         field("right", $.identifier),
       ),
-
-    // assignment    : NAME ':=' expression eol
+    // assignment    : NAME ':=' expression _eol
     assignment: ($) =>
       seq(
         field("left", $.identifier),
         ":=",
         field("right", $.expression),
-        $._eol,
+        $._newline,
       ),
 
     // export        : 'export' assignment
@@ -124,14 +127,14 @@ module.exports = grammar({
               ),
             ),
           ),
-          $._eol,
+          $._newline,
         ),
         seq(
           "set",
           "shell",
           ":=",
           field("right", array($.string_literal)),
-          $._eol,
+          $._newline,
         ),
       ),
 
@@ -216,7 +219,7 @@ module.exports = grammar({
         "[",
         field("contents", comma_sep1(field("attr_item", $.identifier))),
         "]",
-        $._eol,
+        $._newline,
       ),
 
     // A complete recipe
@@ -232,7 +235,7 @@ module.exports = grammar({
     recipe_header: ($) =>
       seq(
         optional("@"),
-        field("recipe_name", $.identifier),
+        field("name", $.identifier),
         optional($.parameters),
         ":",
         optional($.dependencies),
@@ -276,32 +279,27 @@ module.exports = grammar({
     recipe_body: ($) =>
       seq(
         $._indent,
-        field("contents", seq(optional($.shebang), repeat($.recipe_line))),
+        field(
+          "content",
+          seq(
+            optional($.shebang),
+            repeat(seq($.recipe_line, $._newline)),
+            $._newline,
+          ),
+        ),
         $._dedent,
       ),
 
     recipe_line: ($) =>
       seq(
         optional($.recipe_line_prefix),
-        repeat(choice($.text, $.interpolation)),
-        $._newline,
+        repeat1(choice($.text, $.interpolation)),
       ),
 
     recipe_line_prefix: (_) => choice("@-", "-@", "@", "-"),
 
     shebang: ($) => seq(/\s*#!.*/, $._newline),
 
-    // `# ...` comment
-    comment: ($) => seq(/#.*/, $._newline),
-
-    // notinterpolation: ($) => /[^{][^{]\S*/,
-    notinterpolation: (_) => /[^\s{][^\s{]\S*/,
-
-    // interpolation : '{{' expression '}}'
-    interpolation: ($) => seq("{{", $.expression, "}}"),
-
-    identifier: (_) => /[a-zA-Z_][a-zA-Z0-9_-]*/,
-
     // string        : STRING
     //               | INDENTED_STRING
     //               | RAW_STRING
@@ -325,7 +323,12 @@ module.exports = grammar({
     _backticked: (_) => seq("`", repeat(/./), "`"),
     _indented_backticked: (_) => seq("```", repeat(/./), "```"),
 
-    text: (_) => /.+/, // recipe TEXT, only matches in a recipe body
-    // text: (_) => /\S+/, // recipe TEXT, only matches in a recipe body
+    // interpolation : '{{' expression '}}'
+    interpolation: ($) => seq("{{", $.expression, "}}"),
+
+    identifier: (_) => /[a-zA-Z_][a-zA-Z0-9_-]*/,
+
+    // `# ...` comment
+    comment: (_) => token(prec(-1, /#.*/)),
   },
 });