Keep operators and identifiers in container_cursor_to_quoted

Author: josevalim

lib/elixir/src/elixir_tokenizer.erl

@@ -1721,7 +1721,8 @@ cursor_complete(Line, Column, Terminators, Tokens) ->
 add_cursor(_Line, Column, noprune, Terminators, Tokens) ->
   {Column, Terminators, Tokens};
 add_cursor(Line, Column, prune_and_cursor, Terminators, Tokens) ->
-  {PrunedTokens, PrunedTerminators} = prune_tokens(Tokens, [], Terminators),
+  PrePrunedTokens = prune_identifier(Tokens),
+  {PrunedTokens, PrunedTerminators} = prune_tokens(PrePrunedTokens, [], Terminators),
   CursorTokens = [
     {')', {Line, Column + 11, nil}},
     {'(', {Line, Column + 10, nil}},
@@ -1730,6 +1731,9 @@ add_cursor(Line, Column, prune_and_cursor, Terminators, Tokens) ->
   ],
   {Column + 12, PrunedTerminators, CursorTokens}.
 
+prune_identifier([{identifier, _, _} | Tokens]) -> Tokens;
+prune_identifier(Tokens) -> Tokens.
+
 %%% Any terminator needs to be closed
 prune_tokens([{'end', _} | Tokens], Opener, Terminators) ->
   prune_tokens(Tokens, ['end' | Opener], Terminators);
@@ -1776,6 +1780,8 @@ prune_tokens([{'{', _} | _] = Tokens, [], Terminators) ->
   {Tokens, Terminators};
 prune_tokens([{'<<', _} | _] = Tokens, [], Terminators) ->
   {Tokens, Terminators};
+prune_tokens([{identifier, _, _} | _] = Tokens, [], Terminators) ->
+  {Tokens, Terminators};
 prune_tokens([{block_identifier, _, _} | _] = Tokens, [], Terminators) ->
   {Tokens, Terminators};
 prune_tokens([{kw_identifier, _, _} | _] = Tokens, [], Terminators) ->

lib/elixir/test/elixir/code_fragment_test.exs

@@ -1101,8 +1101,10 @@ defmodule CodeFragmentTest do
     end
 
     test "keeps function calls without parens" do
-      # assert cc2q("alias foo") == s2q("alias __cursor__()")
-      # assert cc2q("alias Foo.Bar") == s2q("alias __cursor__()")
+      assert cc2q("alias") == s2q("__cursor__()")
+      assert cc2q("alias ") == s2q("alias __cursor__()")
+      assert cc2q("alias foo") == s2q("alias __cursor__()")
+      assert cc2q("alias Foo.Bar") == s2q("alias __cursor__()")
       assert cc2q("alias Foo.Bar,") == s2q("alias Foo.Bar, __cursor__()")
       assert cc2q("alias Foo.Bar, as: ") == s2q("alias Foo.Bar, as: __cursor__()")
     end

lib/iex/lib/iex/autocomplete.ex

@@ -382,8 +382,11 @@ defmodule IEx.Autocomplete do
           [cursor, pairs, {:|, _, [{variable, _, nil} | _]}, {:%{}, _, _} | _] ->
             container_context_map(cursor, pairs, variable, shell)
 
-          [cursor, {:"::", _, [_, cursor]}, {:<<>>, _, [_ | _]} | _] ->
-            :bitstring_modifier
+          [cursor | tail] ->
+            case remove_operators(tail, cursor) do
+              [{:"::", _, [_, _]}, {:<<>>, _, [_ | _]} | _] -> :bitstring_modifier
+              _ -> nil
+            end
 
           _ ->
             nil
@@ -394,6 +397,12 @@ defmodule IEx.Autocomplete do
     end
   end
 
+  defp remove_operators([{op, _, [_, previous]} = head | tail], previous) when op in [:-],
+    do: remove_operators(tail, head)
+
+  defp remove_operators(tail, _previous),
+    do: tail
+
   defp container_context_struct(cursor, pairs, aliases, shell) do
     with {pairs, [^cursor]} <- Enum.split(pairs, -1),
          alias = value_from_alias(aliases, shell),

lib/iex/test/iex/autocomplete_test.exs

@@ -461,6 +461,12 @@ defmodule IEx.AutocompleteTest do
 
     assert {:yes, ~c"", entries} = expand(~c"<<foo::integer-")
     refute ~c"integer" in entries
+    assert ~c"little" in entries
+    assert ~c"size/1" in entries
+
+    assert {:yes, ~c"", entries} = expand(~c"<<foo::integer-little-")
+    refute ~c"integer" in entries
+    refute ~c"little" in entries
     assert ~c"size/1" in entries
   end