Adjust exclusive FIND destinations

1 files changed, 10 insertions, 0 deletions

diff --git a/lua/clever_f/destination_engine.lua b/lua/clever_f/destination_engine.lua
index ed3b7b2..5e60736 100644
--- a/lua/clever_f/destination_engine.lua
+++ b/lua/clever_f/destination_engine.lua
@@ -94,6 +94,13 @@ local function regular_destination(request, target_position)
 end
 
 local function target_destination(request, target_position)
+  local descriptor = request.plan.descriptor
+  if request.plan.endpoint_policy == domain.EndpointPolicy.VISUAL_EXCLUSIVE
+    and descriptor.direction == domain.Direction.FORWARD
+    and descriptor.family == domain.Family.FIND
+  then
+    return request.view:successor(target_position)
+  end
   return regular_destination(request, target_position)
 end
 
@@ -104,6 +111,9 @@ function DestinationEngine:calculate(view, origin, plan, count, first_move)
     return domain.SearchOutcome.boundary_before_any(request.origin)
   end
   local destination = target_destination(request, target_position)
+  if destination == nil then
+    return domain.SearchOutcome.boundary_before_any(request.origin)
+  end
   return domain.SearchOutcome.complete(destination, 1)
 end