Merge pull request #125 from FluxxField/fix/remove-explicit-dt-presets

fix: remove explicit dt/dT/ct/cT/yt/yT presets so t/T user overrides work

Author: FluxxField

lua/smart-motion/presets.lua

@@ -241,32 +241,6 @@ function presets.delete(exclude)
 				},
 			},
 		},
-		dt = {
-			collector = "lines",
-			extractor = "text_search_2_char_until",
-			filter = "filter_words_on_cursor_line_after_cursor",
-			visualizer = "hint_start",
-			action = "delete",
-			map = true,
-			modes = { "n" },
-			metadata = {
-				label = "Delete Until Searched Text After Cursor",
-				description = "Deletes until the searched for text after the cursor",
-			},
-		},
-		dT = {
-			collector = "lines",
-			extractor = "text_search_2_char_until",
-			filter = "filter_words_on_cursor_line_before_cursor",
-			visualizer = "hint_start",
-			action = "delete",
-			map = true,
-			modes = { "n" },
-			metadata = {
-				label = "Delete Until Searched Text Before Cursor",
-				description = "Deletes until the searched for text before the cursor",
-			},
-		},
 		rdw = {
 			collector = "lines",
 			extractor = "words",
@@ -317,32 +291,6 @@ function presets.yank(exclude)
 				},
 			},
 		},
-		yt = {
-			collector = "lines",
-			extractor = "text_search_2_char_until",
-			filter = "filter_words_on_cursor_line_after_cursor",
-			visualizer = "hint_start",
-			action = "yank_until",
-			map = true,
-			modes = { "n" },
-			metadata = {
-				label = "Yank Until Searched Text After Cursor",
-				description = "Yank until the searched for text after the cursor",
-			},
-		},
-		yT = {
-			collector = "lines",
-			extractor = "text_search_2_char_until",
-			filter = "filter_words_on_cursor_line_before_cursor",
-			visualizer = "hint_start",
-			action = "yank_until",
-			map = true,
-			modes = { "n" },
-			metadata = {
-				label = "Yank Until Searched Text Before Cursor",
-				description = "Yank until the searched for text before the cursor",
-			},
-		},
 		ryw = {
 			collector = "lines",
 			extractor = "words",
@@ -393,32 +341,6 @@ function presets.change(exclude)
 				},
 			},
 		},
-		ct = {
-			collector = "lines",
-			extractor = "text_search_2_char_until",
-			filter = "filter_words_on_cursor_line_after_cursor",
-			visualizer = "hint_start",
-			action = "change_until",
-			map = true,
-			modes = { "n" },
-			metadata = {
-				label = "Change Until Searched Text After Cursor",
-				description = "Change until the searched for text after the cursor",
-			},
-		},
-		cT = {
-			collector = "lines",
-			extractor = "text_search_2_char_until",
-			filter = "filter_words_on_cursor_line_before_cursor",
-			visualizer = "hint_start",
-			action = "change_until",
-			map = true,
-			modes = { "n" },
-			metadata = {
-				label = "Change Until Searched Text Before Cursor",
-				description = "Change until the searched for text",
-			},
-		},
 	}, exclude)
 end
 

lua/smart-motion/types.lua

@@ -46,9 +46,9 @@
 ---@alias SmartMotionPresetKey.Words "w" | "b" | "e" | "ge"
 ---@alias SmartMotionPresetKey.Lines "j" | "k"
 ---@alias SmartMotionPresetKey.Search "s" | "S" | "f" | "F" | "t" | "T" | "gs"
----@alias SmartMotionPresetKey.Delete "d" | "dt" | "dT" | "df" | "dF" | "rdw" | "rdl"
----@alias SmartMotionPresetKey.Yank "y" | "yt" | "yT" | "yf" | "yF" | "ryw" | "ryl"
----@alias SmartMotionPresetKey.Change "c" | "ct" | "cT" | "cf" | "cF"
+---@alias SmartMotionPresetKey.Delete "d" | "rdw" | "rdl"
+---@alias SmartMotionPresetKey.Yank "y" | "ryw" | "ryl"
+---@alias SmartMotionPresetKey.Change "c"
 ---@alias SmartMotionPresetKey.Treesitter "]]" | "[[" | "]c" | "[c" | "]b" | "[b" | "daa" | "caa" | "yaa" | "dfn" | "cfn" | "yfn" | "saa" | "gS" | "R"
 ---@alias SmartMotionPresetKey.Misc "." | "gmd" | "gmy" | "gQf" | "gQd" | "gQe" | "gQg" | "gTf" | "gTd" | "gTe" | "gTg"
 ---@alias SmartMotionPresetKey.Diagnostics "]d" | "[d" | "]e" | "[e"

tests/operators.lua

@@ -1,17 +1,17 @@
 -- SmartMotion Playground: Operator Motions
--- Presets: d, dt, dT, rdw, rdl, y, yt, yT, ryw, ryl, c, ct, cT, p, P
+-- Presets: d, rdw, rdl, y, ryw, ryl, c, p, P
 --          operator-pending: >w, gUw, =j, gqj, etc.
 --
 -- INSTRUCTIONS:
 --   d   → composable delete: press d, then a second motion (w/e/j/k/]]/etc.)
 --   y   → composable yank: press y, then a second motion
 --   c   → composable change: press c, then a second motion
---   dt  → delete until: type a char, delete from cursor to just before match
---   dT  → delete until backward
---   yt  → yank until: type a char, yank from cursor to just before match
---   yT  → yank until backward
---   ct  → change until: type a char, change from cursor to just before match
---   cT  → change until backward
+--   dt  → composable: d + t motion (delete until char via inference)
+--   dT  → composable: d + T motion (delete until backward via inference)
+--   yt  → composable: y + t motion (yank until char via inference)
+--   yT  → composable: y + T motion (yank until backward via inference)
+--   ct  → composable: c + t motion (change until char via inference)
+--   cT  → composable: c + T motion (change until backward via inference)
 --   rdw → remote delete word: pick a word label anywhere, delete that word
 --   rdl → remote delete line: pick a line label, delete that entire line
 --   ryw → remote yank word: pick a word label, yank it