Retain active Visual selections

1 files changed, 10 insertions, 1 deletions

diff --git a/lua/clever_f/motion_executor.lua b/lua/clever_f/motion_executor.lua
index 72a66bd..afa3ee1 100644
--- a/lua/clever_f/motion_executor.lua
+++ b/lua/clever_f/motion_executor.lua
@@ -74,9 +74,10 @@ end
 local function require_host(host)
   if type(host) ~= "table"
     or type(host.read_cursor) ~= "function"
+    or type(host.read_selection) ~= "function"
     or type(host.apply_cursor) ~= "function"
   then
-    fail("MotionExecutor host must provide cursor movement", 3)
+    fail("MotionExecutor host must provide movement state", 3)
   end
   return host
 end
@@ -234,8 +235,16 @@ end
 
 function MotionExecutor:_execute_visual(request)
   local host = executor_records[self].host
+  local selection = host:read_selection()
+  if not domain.Selection.is(selection)
+    or not selection.active
+    or selection.kind ~= request.context.visual_kind
+  then
+    fail("Visual motion execution requires its active selection kind", 2)
+  end
   local origin = host:read_cursor()
   local outcome = calculate(self, request, origin)
+  request.selection = selection
   return domain.ActionOutcome.from_search(outcome, request.plan.descriptor)
 end