Merge pull request #7 from desdic/dev

desdic · web-flow · commit 5fc094c9afdb · 2023-08-31T20:33:02.000+02:00
Align functions between telescope/non-telescope
diff --git a/README.md b/README.md
@@ -20,6 +20,8 @@ Works with or without telescope.
         { "<Leader>kks", function() require('macrothis').save() end, desc = "save register" },
         { "<Leader>kkl", function() require('macrothis').load() end, desc = "load register" }
         { "<Leader>kkd", function() require('macrothis').delete() end, desc = "delete register" }
+        { "<Leader>kkr", function() require('macrothis').run() end, desc = "run macro" }
+        { "<Leader>kkq", function() require('macrothis').quickfix() end, desc = "run macro on all files in quickfix" }
     }
 },
 ```
diff --git a/doc/macrothis.txt b/doc/macrothis.txt
@@ -29,6 +29,20 @@ Using Lazy plugin manager
                 require('macrothis').delete()
             end,
             desc = "delete register/macro"
+        },
+        {
+            "<Leader>kkq",
+            function()
+                require('macrothis').quickfix()
+            end,
+            desc = "run on quickfix list"
+        },
+        {
+            "<Leader>kkr",
+            function()
+                require('macrothis').run()
+            end,
+            desc = "run macro"
         }
     }
 },
@@ -58,6 +72,22 @@ Delete a macro/register
 Usage~
 `require('macrothis').delete()`
 
+------------------------------------------------------------------------------
+                                                               *macrothis.run()*
+                               `macrothis.run`()
+Run macro
+
+Usage~
+`require('macrothis').run()`
+
+------------------------------------------------------------------------------
+                                                          *macrothis.quickfix()*
+                             `macrothis.quickfix`()
+Run macro on all in quickfix list
+
+Usage~
+`require('macrothis').quickfix()`
+
 ------------------------------------------------------------------------------
                                                                        *default*
                                    `default`
@@ -66,6 +96,7 @@ Default options
   local default = {
       datafile = vim.fn.stdpath("data") .. "/macrothis.json",
       registers = generate_register_list(),
+      run_register = "z", -- content of register z is replaced when running a macro
   }
 <
 
@@ -101,7 +132,6 @@ Default telescope options
               { remaining = true },
           },
       },
-      run_register = "z", -- content of register z is replaced when running a macro
   }
 <
 
diff --git a/lua/macrothis/init.lua b/lua/macrothis/init.lua
@@ -25,6 +25,20 @@
 ---                 require('macrothis').delete()
 ---             end,
 ---             desc = "delete register/macro"
+---         },
+---         {
+---             "<Leader>kkq",
+---             function()
+---                 require('macrothis').quickfix()
+---             end,
+---             desc = "run on quickfix list"
+---         },
+---         {
+---             "<Leader>kkr",
+---             function()
+---                 require('macrothis').run()
+---             end,
+---             desc = "run macro"
 ---         }
 ---     }
 --- },
@@ -86,9 +100,18 @@ macrothis.save = function()
         end,
     }, function(register, _)
         if register then
-            local description = vim.fn.input("Enter description: ", "")
-            utils.store_register(macrothis.opts, register.value, description)
-            macrothis.opts.last_used = description
+            vim.ui.input(
+                { prompt = "Enter description: " },
+                function(description)
+                    print(vim.inspect(register))
+                    utils.store_register(
+                        macrothis.opts,
+                        register.label,
+                        description
+                    )
+                    macrothis.opts.last_used = description
+                end
+            )
         end
     end)
 end
@@ -151,6 +174,52 @@ macrothis.delete = function()
     end)
 end
 
+--- Run macro
+---
+---@usage `require('macrothis').run()`
+macrothis.run = function()
+    local menuelem = macrothis.generate_menu_items()
+
+    vim.ui.select(menuelem, {
+        prompt = "Run on quickfix list",
+        format_item = function(item)
+            return ("%s: %s"):format(item.label, item.value)
+        end,
+    }, function(description, _)
+        if description then
+            utils.run_macro(
+                macrothis.opts,
+                macrothis.opts.run_register,
+                description.label
+            )
+            macrothis.opts.last_used = description.label
+        end
+    end)
+end
+
+--- Run macro on all in quickfix list
+---
+---@usage `require('macrothis').quickfix()`
+macrothis.quickfix = function()
+    local menuelem = macrothis.generate_menu_items()
+
+    vim.ui.select(menuelem, {
+        prompt = "Run on quickfix list",
+        format_item = function(item)
+            return ("%s: %s"):format(item.label, item.value)
+        end,
+    }, function(description, _)
+        if description then
+            utils.run_macro_on_quickfixlist(
+                macrothis.opts,
+                macrothis.opts.run_register,
+                description.label
+            )
+            macrothis.opts.last_used = description.label
+        end
+    end)
+end
+
 local generate_register_list = function()
     local registers_table = { '"', "-", "#", "=", "/", "*", "+", ":", ".", "%" }
 
@@ -172,6 +241,7 @@ end
 local default = {
     datafile = vim.fn.stdpath("data") .. "/macrothis.json",
     registers = generate_register_list(),
+    run_register = "z", -- content of register z is replaced when running a macro
 }
 --minidoc_afterlines_end
 
diff --git a/lua/macrothis/utils.lua b/lua/macrothis/utils.lua
@@ -59,7 +59,7 @@ end
 
 utils.run_macro_on_quickfixlist = function(opts, register, description)
     utils.load_register(opts, register, description)
-    vim.cmd(":cdo norm! @" .. register)
+    vim.cmd(":cfdo norm! @" .. register)
     -- Make sure we are back into normal mode after replacement
     vim.api.nvim_feedkeys(
         vim.api.nvim_replace_termcodes("<ESC>", true, false, true),
diff --git a/lua/telescope/_extensions/macrothis.lua b/lua/telescope/_extensions/macrothis.lua
@@ -39,7 +39,6 @@ local default_telescope = {
             { remaining = true },
         },
     },
-    run_register = "z", -- content of register z is replaced when running a macro
 }
 --minidoc_afterlines_end
 
@@ -200,7 +199,7 @@ local run_macro = function(prompt_bufnr)
 
     utils.run_macro(
         macrothis.opts,
-        macrothis.telescope_config.run_register,
+        macrothis.opts.run_register,
         selected_register.value.label
     )
 end
@@ -212,7 +211,7 @@ local run_macro_on_quickfixlist = function(prompt_bufnr)
 
     utils.run_macro_on_quickfixlist(
         macrothis.opts,
-        macrothis.telescope_config.run_register,
+        macrothis.opts.run_register,
         selected_register.value.label
     )
 end

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ Works with or without telescope.`
`20`	`20`	`{ "<Leader>kks", function() require('macrothis').save() end, desc = "save register" },`
`21`	`21`	`{ "<Leader>kkl", function() require('macrothis').load() end, desc = "load register" }`
`22`	`22`	`{ "<Leader>kkd", function() require('macrothis').delete() end, desc = "delete register" }`
	`23`	`+ { "<Leader>kkr", function() require('macrothis').run() end, desc = "run macro" }`
	`24`	`+ { "<Leader>kkq", function() require('macrothis').quickfix() end, desc = "run macro on all files in quickfix" }`
`23`	`25`	`}`
`24`	`26`	`},`
`25`	`27`	```