Highlight echo

grammar.js

@@ -21,6 +21,7 @@ module.exports = grammar({
     [$.source_file],
     [$._constant_value, $._case_clause_guard_unit],
     [$.integer],
+    [$.echo],
   ],
   rules: {
     /* General rules */
@@ -298,7 +299,13 @@ module.exports = grammar({
         binaryExpr(prec.left, 4, ">=", $._expression),
         binaryExpr(prec.left, 4, ">.", $._expression),
         binaryExpr(prec.left, 4, ">=.", $._expression),
-        binaryExpr(prec.left, 5, "|>", $._expression),
+        binaryExpr(
+          prec.left,
+          5,
+          "|>",
+          $._expression,
+          choice($.pipeline_echo, $._expression)
+        ),
         binaryExpr(prec.left, 6, "+", $._expression),
         binaryExpr(prec.left, 6, "+.", $._expression),
         binaryExpr(prec.left, 6, "-", $._expression),
@@ -330,6 +337,7 @@ module.exports = grammar({
         $.todo,
         $.panic,
         $.tuple,
+        $.echo,
         $.list,
         alias($._expression_bit_string, $.bit_string),
         $.anonymous_function,
@@ -369,6 +377,8 @@ module.exports = grammar({
           )
         )
       ),
+    pipeline_echo: (_$) => prec.left("echo"),
+    echo: ($) => seq("echo", $._expression),
     tuple: ($) => seq("#", "(", optional(series_of($._expression, ",")), ")"),
     list: ($) =>
       seq(

queries/highlights.scm

@@ -73,7 +73,7 @@
 ; TODO: when tree-sitter supports `#any-of?` in the Rust bindings,
 ; refactor this to use `#any-of?` rather than `#match?`
 ((identifier) @error
- (#match? @error "^(auto|delegate|derive|else|implement|macro|test|echo)$"))
+ (#match? @error "^(auto|delegate|derive|else|implement|macro|test)$"))
 
 ; Variables
 (identifier) @variable
@@ -87,6 +87,7 @@
   "assert"
   "case"
   "const"
+  "echo"
   ; DEPRECATED: 'external' was removed in v0.30.
   "external"
   "fn"

test/corpus/echo.txt

@@ -0,0 +1,112 @@
+================================================================================
+Echo with expression
+================================================================================
+
+pub fn main() {
+  echo 1
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (function
+    (visibility_modifier)
+    (identifier)
+    (function_parameters)
+    (function_body
+      (echo
+        (integer)))))
+
+================================================================================
+Echo in pipeline
+================================================================================
+
+pub fn main() {
+  []
+  |> echo
+  |> panic
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (function
+    (visibility_modifier)
+    (identifier)
+    (function_parameters)
+    (function_body
+      (binary_expression
+        (binary_expression
+          (list)
+          (pipeline_echo))
+        (panic)))))
+
+================================================================================
+Echo last in pipeline
+================================================================================
+
+pub fn main() {
+  []
+  |> echo
+
+  1
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (function
+    (visibility_modifier)
+    (identifier)
+    (function_parameters)
+    (function_body
+      (binary_expression
+        (list)
+        (pipeline_echo))
+      (integer))))
+
+================================================================================
+Echo precedence with pipes
+================================================================================
+
+pub fn main() {
+  echo 1 |> 2
+  3
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (function
+    (visibility_modifier)
+    (identifier)
+    (function_parameters)
+    (function_body
+      (echo
+        (binary_expression
+          (integer)
+          (integer)))
+      (integer))))
+
+================================================================================
+Echo precedence with binop
+================================================================================
+
+pub fn main() {
+  echo 1 + 2
+  3
+}
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (function
+    (visibility_modifier)
+    (identifier)
+    (function_parameters)
+    (function_body
+      (echo
+        (binary_expression
+          (integer)
+          (integer)))
+      (integer))))

test/highlight/reserved.gleam

@@ -12,5 +12,3 @@ macro
 // <- error
 test
 // <- error
-echo
-// <- error