fix: parsing crashes on code with errors

Author: doorgan

.gitignore

@@ -27,3 +27,4 @@ spitfire-*.tar
 benchmarks
 *.bggg
 priv/plts/*
+.expert

lib/spitfire.ex

@@ -174,6 +174,7 @@ defmodule Spitfire do
     case result do
       {:ok, ast} -> {:ok, ast, comments}
       {:error, ast, errors} -> {:error, ast, comments, errors}
+      {:error, :no_fuel_remaining} -> {:error, :no_fuel_remaining}
     end
   after
     Process.delete(:code_formatter_comments)
@@ -619,9 +620,16 @@ defmodule Spitfire do
       {kvs, parser} =
         while2 peek_token(parser) == :"," <- parser do
           parser = parser |> next_token() |> next_token()
-          {pair, parser} = parse_kw_identifier(parser)
 
-          {pair, parser}
+          case current_token_type(parser) do
+            type when type in [:kw_identifier, :kw_identifier_unsafe] ->
+              {pair, parser} = parse_kw_identifier(parser)
+              {pair, parser}
+
+            _ ->
+              # Not a keyword identifier, exit the loop
+              {:filter, {nil, parser}}
+          end
         end
 
       {[{token, value} | kvs], parser}
@@ -646,9 +654,16 @@ defmodule Spitfire do
       {kvs, parser} =
         while2 peek_token(parser) == :"," <- parser do
           parser = parser |> next_token() |> next_token()
-          {pair, parser} = parse_kw_identifier(parser)
 
-          {pair, parser}
+          case current_token_type(parser) do
+            type when type in [:kw_identifier, :kw_identifier_unsafe] ->
+              {pair, parser} = parse_kw_identifier(parser)
+              {pair, parser}
+
+            _ ->
+              # Not a keyword identifier, exit the loop
+              {:filter, {nil, parser}}
+          end
         end
 
       {[{atom, value} | kvs], parser}
@@ -1698,11 +1713,9 @@ defmodule Spitfire do
           {parser, is_valid} = validate_peek(parser, current_token_type(parser))
 
           if is_valid do
-            while peek_token(parser) not in terminals && calc_prec(parser, associativity, precedence) <- {left, parser} do
-              case peek_token_type(parser) do
-                :. -> parse_dot_expression(next_token(parser), left)
-                _ -> {left, parser}
-              end
+            while peek_token(parser) not in terminals && peek_token(parser) == :. &&
+                    calc_prec(parser, associativity, precedence) <- {left, parser} do
+              parse_dot_expression(next_token(parser), left)
             end
           else
             {left, parser}
@@ -2415,6 +2428,10 @@ defmodule Spitfire do
     :eof
   end
 
+  defp peek_token(%{peek_token: nil}) do
+    :eof
+  end
+
   defp peek_token_eat_eol(%{peek_token: {:eol, _token}} = parser) do
     peek_token_eat_eol(next_token(parser))
   end

test/spitfire_test.exs

@@ -2722,6 +2722,34 @@ defmodule SpitfireTest do
                ]
              }
     end
+
+    test "incomplete struct in match expression" do
+      assert Spitfire.parse("%Foo = x") ==
+               {:error,
+                {:%, [line: 1, column: 1],
+                 [
+                   {:__aliases__, [last: [line: 1, column: 2], line: 1, column: 2], [:Foo]},
+                   {:%{}, [closing: [line: 1, column: 8], line: 1, column: 6], [{:x, [line: 1, column: 8], nil}]}
+                 ]}, [{[line: 1, column: 8], "missing closing brace for struct"}]}
+    end
+
+    test "invalid character inside list" do
+      assert Spitfire.parse("[«]") ==
+               {:error, [{:__block__, [error: true], []}],
+                [
+                  {[], "unknown token: eot"},
+                  {[line: 1, column: 1], "missing closing bracket for list"}
+                ]}
+    end
+
+    test "invalid character inside tuple" do
+      assert Spitfire.parse("{«}") ==
+               {:error, {:{}, [closing: [], line: 1, column: 1], [{:__block__, [error: true], []}]},
+                [
+                  {[], "unknown token: eot"},
+                  {[line: 1, column: 1], "missing closing brace for tuple"}
+                ]}
+    end
   end
 
   describe "&parse_with_comments/2" do