refactor: simplify module redirection logic

Author: chrisgrieser

lua/various-textobjs/init.lua

@@ -8,15 +8,9 @@ function M.setup(userConfig) require("various-textobjs.config.config").setup(use
 setmetatable(M, {
 	__index = function(_, key)
 		return function(...)
-			local linewiseObjs = vim.tbl_keys(require("various-textobjs.textobjs.linewise"))
-
-			local module = "charwise"
-			if vim.tbl_contains(linewiseObjs, key) then module = "linewise" end
-			if key == "column" then module = "blockwise" end
-			if key == "diagnostic" then module = "diagnostic" end
-			if key == "subword" then module = "subword" end
-			if key == "emoji" then module = "emoji" end
+			local warn = require("various-textobjs.utils").warn
 
+			-- DEPRECATION (2025-04-24)
 			if key == "pyTripleQuotes" then
 				local msg = "The `pyTripleQuotes` textobj is deprecated. "
 					.. "Please use `nvim-treesitter-teextobjects`, create a file "
@@ -27,11 +21,28 @@ setmetatable(M, {
 					.. "(expression_statement (string (string_content) @docstring.inner) @docstring.outer)\n"
 					.. "```\n"
 					.. "Call the textobject via `:TSTextobjectSelect @docstring.outer`"
-				require("various-textobjs.utils").warn(msg)
+				warn(msg)
 				return function() end -- empty function to prevent error
 			end
 
-			require("various-textobjs.textobjs." .. module)[key](...)
+			local linewiseObjs = vim.tbl_keys(require("various-textobjs.textobjs.linewise"))
+			local charwiseObjs = vim.tbl_keys(require("various-textobjs.textobjs.charwise"))
+
+			local module
+			if vim.tbl_contains(linewiseObjs, key) then module = "linewise" end
+			if vim.tbl_contains(charwiseObjs, key) then module = "charwise" end
+			if key == "column" then module = "blockwise" end
+			if key == "diagnostic" then module = "diagnostic" end
+			if key == "subword" then module = "subword" end
+			if key == "emoji" then module = "emoji" end
+
+			if module then
+				require("various-textobjs.textobjs." .. module)[key](...)
+			else
+				local msg = ("There is no text object called `%s`.\n\n"):format(key)
+					.. "Make sure it exists in the list of text objects, and that you haven't misspelled it."
+				warn(msg)
+			end
 		end
 	end,
 })

lua/various-textobjs/textobjs/charwise.lua

@@ -3,19 +3,6 @@ local core = require("various-textobjs.charwise-core")
 local u = require("various-textobjs.utils")
 --------------------------------------------------------------------------------
 
--- Warn in case user tries to call a textobj that doesn't exist.
--- (Only needed in the module for `charwise` text objects, since it is the
--- catch-all for the `__index` redirect from this plugin's main `init.lua`.)
-setmetatable(M, {
-	__index = function(_, key)
-		return function()
-			local msg = ("There is no text object called `%s`.\n\n"):format(key)
-				.. "Make sure it exists in the list of text objects, and that you haven't misspelled it."
-			u.warn(msg)
-		end
-	end,
-})
-
 ---@return integer
 ---@nodiscard
 local function smallForward()