Fragment handle anonymous calls with extra spaces (#12847)

Author: sabiwara

lib/elixir/lib/code/fragment.ex

@@ -246,20 +246,23 @@ defmodule Code.Fragment do
     end
   end
 
-  defp call_to_cursor_context({[?., h | t], spaces}) when h not in @non_identifier do
-    case identifier_to_cursor_context([h | t], spaces, true) do
-      {{:local_or_var, acc}, count} -> {{:anonymous_call, {:var, acc}}, count + 1}
-      {{:module_attribute, _} = attr, count} -> {{:anonymous_call, attr}, count + 1}
-      {_, _} -> {:none, 0}
-    end
-  end
-
   defp call_to_cursor_context({reverse, spaces}) do
-    case identifier_to_cursor_context(reverse, spaces, true) do
-      {{:local_or_var, acc}, count} -> {{:local_call, acc}, count}
-      {{:dot, base, acc}, count} -> {{:dot_call, base, acc}, count}
-      {{:operator, acc}, count} -> {{:operator_call, acc}, count}
-      {_, _} -> {:none, 0}
+    with [?. | rest] <- reverse,
+         {rest, spaces} = strip_spaces(rest, spaces),
+         [h | _] when h not in @non_identifier <- rest do
+      case identifier_to_cursor_context(rest, spaces, true) do
+        {{:local_or_var, acc}, count} -> {{:anonymous_call, {:var, acc}}, count + 1}
+        {{:module_attribute, _} = attr, count} -> {{:anonymous_call, attr}, count + 1}
+        {_, _} -> {:none, 0}
+      end
+    else
+      _ ->
+        case identifier_to_cursor_context(reverse, spaces, true) do
+          {{:local_or_var, acc}, count} -> {{:local_call, acc}, count}
+          {{:dot, base, acc}, count} -> {{:dot_call, base, acc}, count}
+          {{:operator, acc}, count} -> {{:operator_call, acc}, count}
+          {_, _} -> {:none, 0}
+        end
     end
   end
 

lib/elixir/test/elixir/code_fragment_test.exs

@@ -209,7 +209,10 @@ defmodule CodeFragmentTest do
       assert CF.cursor_context("hello.(\n") == {:anonymous_call, {:var, ~c"hello"}}
       assert CF.cursor_context("hello.(\r\n") == {:anonymous_call, {:var, ~c"hello"}}
 
+      assert CF.cursor_context("hello . (") == {:anonymous_call, {:var, ~c"hello"}}
+
       assert CF.cursor_context("@hello.(") == {:anonymous_call, {:module_attribute, ~c"hello"}}
+      assert CF.cursor_context("@hello . (") == {:anonymous_call, {:module_attribute, ~c"hello"}}
     end
 
     test "nested expressions" do