fix(repeatable_move): fix repeatable_move when nil was returned; modified the README to address the change; no longer requires { expr = true }

Author: mezdelex

README.md

@@ -170,8 +170,8 @@ local ts_repeat_move = require "nvim-treesitter-textobjects.repeatable_move"
 
 -- Repeat movement with ; and ,
 -- ensure ; goes forward and , goes backward regardless of the last direction
-vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat_move.repeat_last_move_next, { expr = true })
-vim.keymap.set({ "n", "x", "o" }, ",", ts_repeat_move.repeat_last_move_previous, { expr = true })
+vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat_move.repeat_last_move_next)
+vim.keymap.set({ "n", "x", "o" }, ",", ts_repeat_move.repeat_last_move_previous)
 
 -- vim way: ; goes to the direction you were moving.
 -- vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat_move.repeat_last_move)
@@ -238,6 +238,7 @@ Here are some rules about the query names that should be noted.
 ## Built-in Textobjects
 
 <!--textobjectinfo-->
+
 1. @assignment.inner
 2. @assignment.lhs
 3. @assignment.outer

lua/nvim-treesitter-textobjects/repeatable_move.lua

@@ -27,18 +27,17 @@ M.make_repeatable_move = function(move_fn)
 end
 
 ---@param opts_extend TSTextObjects.MoveOpts?
----@return string?
 M.repeat_last_move = function(opts_extend)
   if not M.last_move then
     return
   end
   local opts = vim.tbl_deep_extend('force', M.last_move.opts, opts_extend or {})
   if M.last_move.func == 'f' or M.last_move.func == 't' then
-    return opts.forward and ';' or ','
+    vim.api.nvim_feedkeys(vim.v.count1 .. (opts.forward and ';' or ','), 'n', true)
   elseif M.last_move.func == 'F' or M.last_move.func == 'T' then
-    return opts.forward and ',' or ';'
+    vim.api.nvim_feedkeys(vim.v.count1 .. (opts.forward and ',' or ';'), 'n', true)
   else
-    return M.last_move.func(opts, unpack(M.last_move.additional_args))
+    M.last_move.func(opts, unpack(M.last_move.additional_args))
   end
 end
 

queries/fennel/textobjects.scm

@@ -102,9 +102,8 @@
     rhs: (_) @assignment.rhs) @assignment.inner) @assignment.outer
 
 (set_form
-  (binding_pair
-    lhs: (_) @assignment.lhs
-    rhs: (_) @assignment.rhs) @assignment.inner) @assignment.outer
+  lhs: (_) @assignment.lhs
+  rhs: (_) @assignment.rhs) @assignment.inner @assignment.outer
 
 (let_vars
   (binding_pair