Improvements

Author: jonatanklosko

grammar.js

@@ -172,7 +172,7 @@ module.exports = grammar({
     //   * operator identifier in `(-> / 2)`
     [$.operator_identifier, $.stab_clause],
 
-    // Given `& /`, ampersand can be either:
+    // Given `& • /`, ampersand can be either:
     //   * capture operator in `& / / 2`
     //   * operator identifier in `& / 1`
     [$.unary_operator, $.operator_identifier],
@@ -530,16 +530,15 @@ module.exports = grammar({
         ...ARROW_OPS,
         "in",
         alias($._not_in, "not in"),
-        "^^",
+        "^^^",
         ...CONCAT_OPS,
         // The range operator has both a binary and a nullary version.
         // The nullary version is already parsed as operator_identifier,
         // so it covers this case
         // ".."
         ...MULT_OPS,
         "**",
-        "->",
-        "."
+        "->"
       ),
 
     dot: ($) =>

queries/highlights.scm

@@ -117,7 +117,7 @@
 ; * kernel or special forms keyword
 (call
   target: (identifier) @keyword
-  (#match? @keyword "^(alias|case|cond|else|for|if|import|quote|raise|receive|require|reraise|super|throw|try|unless|unquote|unquote_splicing|use|with)$"))
+  (#match? @keyword "^(alias|case|cond|for|if|import|quote|raise|receive|require|reraise|super|throw|try|unless|unquote|unquote_splicing|use|with)$"))
 
 ; * function call
 (call

src/scanner.c

@@ -463,6 +463,7 @@ static bool scan_newline(TSLexer *lexer, const bool *valid_symbols) {
         advance(lexer);
         return check_operator_end(lexer);
       }
+      // when
     } else if (lexer->lookahead == 'w') {
       advance(lexer);
       if (lexer->lookahead == 'h') {
@@ -475,6 +476,7 @@ static bool scan_newline(TSLexer *lexer, const bool *valid_symbols) {
           }
         }
       }
+      // and
     } else if (lexer->lookahead == 'a') {
       advance(lexer);
       if (lexer->lookahead == 'n') {

test/corpus/expression/anonymous_function.txt

@@ -115,6 +115,29 @@ end
 
 ---
 
+(source
+  (anonymous_function
+    (stab_clause
+      (arguments
+        (identifier)
+        (identifier))
+      (body
+        (identifier)
+        (identifier)))))
+
+=====================================
+multiline body with extra newlines
+=====================================
+
+fn x, y ->
+  y
+
+  x
+
+end
+
+---
+
 (source
   (anonymous_function
     (stab_clause

test/highlight/module.ex

@@ -147,15 +147,15 @@ defmodule Long.Module.Name do
   end
   # <- keyword
 
-  def with_guard(x) when x == 1 do: nil
+  def with_guard(x) when x == 1, do: nil
   # <- keyword
   #   ^ function
   #              ^ variable
   #                 ^ keyword
   #                      ^ variable
   #                        ^ operator
   #                           ^ number
-  #                             ^ keyword
+  #                              ^ string.special.symbol
   # <- keyword
 
   def with_guard when is_integer(1), do: nil