Fix crash in keyword parsing

Author: lukaszsamson

lib/spitfire.ex

@@ -549,10 +549,15 @@ 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}
+        if kw_identifier?(current_token(parser)) do
+          parser = parser |> next_token() |> next_token()
+          {pair, parser} = parse_kw_identifier(parser)
+          {pair, parser}
+        else
+          parser = parser |> next_token() |> next_token()
+          {item, parser} = parse_expression(parser, @kw_identifier, true, false, false)
+          {item, parser}
+        end
       end
 
     {[{token, value} | kvs], parser}
@@ -573,15 +578,24 @@ 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}
+        if kw_identifier?(current_token(parser)) do
+          parser = parser |> next_token() |> next_token()
+          {pair, parser} = parse_kw_identifier(parser)
+          {pair, parser}
+        else
+          parser = parser |> next_token() |> next_token()
+          {item, parser} = parse_expression(parser, @kw_identifier, true, false, false)
+          {item, parser}
+        end
       end
 
     {[{atom, value} | kvs], parser}
   end
 
+  defp kw_identifier?({:kw_identifier, _, _}), do: true
+  defp kw_identifier?({:kw_identifier_unsafe, _, _}), do: true
+  defp kw_identifier?(_), do: false
+
   defp parse_assoc_op(%{current_token: {:assoc_op, _, _token}} = parser, key) do
     parser = parser |> next_token() |> eat_eol()
     {value, parser} = parse_expression(parser, @assoc_op, false, false, false)

test/spitfire_test.exs

@@ -534,6 +534,24 @@ defmodule SpitfireTest do
       end
     end
 
+    test "unfinished keyword list" do
+      code = ~S'''
+      defmodule MyModule do
+        IO.inspect(
+          :stderr,
+          label: "label",
+          (__cursor__())
+        )
+      end
+      '''
+
+      assert Spitfire.parse(code) == s2q(code)
+
+      code = ~S'foo(a, "#{field}": value, (__cursor__()))'
+
+      assert Spitfire.parse(code) == s2q(code)
+    end
+
     test "another thing" do
       code = ~S'''
       case foo do