From 6d2eb6a631819f2c83c94123e6f20c9544e1d154 Mon Sep 17 00:00:00 2001
From: Peter Pavicic <peter.pavicic@gmail.com>
Date: Fri, 10 Apr 2026 03:08:07 +0200
Subject: [PATCH] Fix: RSendMotion support for motions 0, fFtT, ip/ap, Fixes
 #547

---
 lua/r/send.lua | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/lua/r/send.lua b/lua/r/send.lua
index bf98aebd..e8ce79ea 100644
--- a/lua/r/send.lua
+++ b/lua/r/send.lua
@@ -238,7 +238,16 @@ local M = {}
 ---@param should_dedent boolean Whether to dedent the code
 ---@param m string|nil Movement mode ("move" or nil)
 ---@return boolean Whether the command was sent successfully
-local function send_chunk_line(chunk, line, lnum, lang, stop_fn, wrap_fn, should_dedent, m)
+local function send_chunk_line(
+    chunk,
+    line,
+    lnum,
+    lang,
+    stop_fn,
+    wrap_fn,
+    should_dedent,
+    m
+)
     local lines
     lines, lnum = get_ts_code_to_send(chunk, line, lnum, lang, stop_fn)
     local code = table.concat(lines, "\n")
@@ -507,8 +516,22 @@ M.motion_wrapper = function()
 
     motion = char
 
-    -- If first char is a digit, keep reading digits
-    while char:match("%d") do
+    -- If first char is a non-zero digit, keep reading digits
+    while char:match("[1-9]") do
+        ok, char = pcall(vim.fn.getcharstr)
+        if not ok or char == "\27" then return end
+        motion = motion .. char
+    end
+
+    -- If part of two-character motion is typed (in/around), keep reading
+    if
+        char == "i"
+        or char == "a"
+        or char == "f"
+        or char == "F"
+        or char == "t"
+        or char == "T"
+    then
         ok, char = pcall(vim.fn.getcharstr)
         if not ok or char == "\27" then return end
         motion = motion .. char