Ensure block_keyword_or_binary_operator is handled in surround context, closes #14590

Author: josevalim

lib/elixir/lib/code/fragment.ex

@@ -771,6 +771,12 @@ defmodule Code.Fragment do
           {{:local_or_var, acc}, offset} ->
             build_surround({:local_or_var, acc}, reversed, line, offset)
 
+          {{:block_keyword_or_binary_operator, acc}, offset} when acc in @textual_operators ->
+            build_surround({:operator, acc}, reversed, line, offset)
+
+          {{:block_keyword_or_binary_operator, acc}, offset} when acc in @keywords ->
+            build_surround({:keyword, acc}, reversed, line, offset)
+
           {{:module_attribute, ~c""}, offset} ->
             build_surround({:operator, ~c"@"}, reversed, line, offset)
 

lib/elixir/test/elixir/code_fragment_test.exs

@@ -562,14 +562,20 @@ defmodule CodeFragmentTest do
       assert CF.surround_context("안녕_세상", {1, 6}) == :none
 
       # Keywords are not local or var
-      for keyword <- ~w(do end after catch else rescue fn true false nil)c do
-        keyword_length = length(keyword) + 1
-
-        assert %{
-                 context: {:keyword, ^keyword},
+      for keyword <- ~w(do end after catch else rescue fn true false nil)c,
+          length = length(keyword),
+          i <- 1..length do
+        assert CF.surround_context(keyword, {1, i}) == %{
+                 context: {:keyword, keyword},
                  begin: {1, 1},
-                 end: {1, ^keyword_length}
-               } = CF.surround_context(keyword, {1, 1})
+                 end: {1, length + 1}
+               }
+
+        assert CF.surround_context(~c"Foo " ++ keyword, {1, 4 + i}) == %{
+                 context: {:keyword, keyword},
+                 begin: {1, 5},
+                 end: {1, length + 5}
+               }
       end
     end
 
@@ -664,6 +670,12 @@ defmodule CodeFragmentTest do
                  begin: {1, 1},
                  end: {1, byte_size(op) + 1}
                }
+
+        assert CF.surround_context("Foo #{op}", {1, 4 + i}) == %{
+                 context: {:operator, String.to_charlist(op)},
+                 begin: {1, 5},
+                 end: {1, byte_size(op) + 5}
+               }
       end
     end