Correctly get range of do/end blocks that have eoe

lib/sourceror/range.ex

@@ -472,11 +472,16 @@ defmodule Sourceror.Range do
     end_position = Sourceror.get_end_position(quoted)
 
     end_position =
-      if Keyword.has_key?(meta, :end) do
-        Keyword.update!(end_position, :column, &(&1 + 3))
-      else
-        # If it doesn't have an end token, then it has either a ), a ] or a }
-        Keyword.update!(end_position, :column, &(&1 + 1))
+      cond do
+        Keyword.has_key?(meta, :end_of_expression) ->
+          Keyword.update!(end_position, :column, &(&1 + 1))
+
+        Keyword.has_key?(meta, :end) ->
+          Keyword.update!(end_position, :column, &(&1 + 3))
+
+        true ->
+          # If it doesn't have an end token, then it has either a ), a ] or a }
+          Keyword.update!(end_position, :column, &(&1 + 1))
       end
 
     %{start: start_position, end: end_position}

test/range_test.exs

@@ -460,6 +460,48 @@ defmodule SourcerorTest.RangeTest do
                |> String.trim_trailing()
     end
 
+    test "do/end blocks that also have :end_of_expression" do
+      alias Sourceror.Zipper, as: Z
+
+      code = ~S"""
+      foo do
+        x ->
+          bar do
+            a -> b
+            c, d -> e
+          end
+
+        :foo
+      end
+      """
+
+      value =
+        code
+        |> Sourceror.parse_string!()
+        |> Z.zip()
+        |> Z.find(fn
+          {:bar, _, _} -> true
+          _ -> false
+        end)
+        |> Z.node()
+
+      range = Sourceror.Range.get_range(value)
+
+      assert decorate(code, range) ==
+               ~S"""
+               foo do
+                 x ->
+                   «bar do
+                     a -> b
+                     c, d -> e
+                   end»
+
+                 :foo
+               end
+               """
+               |> String.trim_trailing()
+    end
+
     test "stabs" do
       alias Sourceror.Zipper, as: Z