refactor: Use inbuilt commenting on NeoVim 0.10+

Author: andrewferrier

README.md

@@ -72,7 +72,7 @@ return {
     "andrewferrier/debugprint.nvim",
     opts = { … },
     dependencies = {
-        "echasnovski/mini.nvim" -- Needed to enable :ToggleCommentDebugPrints
+        "echasnovski/mini.nvim" -- Needed to enable :ToggleCommentDebugPrints for NeoVim <= 0.9
         "nvim-treesitter/nvim-treesitter" -- Only needed for NeoVim 0.8
     },
     -- Remove the following line to use development versions,
@@ -93,7 +93,7 @@ packer.startup(function(use)
             require("debugprint").setup(opts)
         end,
         requires = {
-            "echasnovski/mini.nvim" -- Needed to enable :ToggleCommentDebugPrints
+            "echasnovski/mini.nvim" -- Needed to enable :ToggleCommentDebugPrints for NeoVim <= 0.9
         }
     })
     …

lua/debugprint/init.lua

@@ -257,34 +257,24 @@ M.deleteprints = function(opts)
 end
 
 M.toggle_comment_debugprints = function(opts)
-    local status, comment = pcall(require, "mini.comment")
-
-    if status == true then
-        local lines_to_consider
-        local initial_line
-
-        lines_to_consider, initial_line = get_lines_to_handle(opts)
-
-        for count, line in ipairs(lines_to_consider) do
-            if string.find(line, global_opts.print_tag, 1, true) ~= nil then
-                local line_to_toggle = count + initial_line - 1
-                vim.api.nvim_buf_set_lines(
-                    0,
-                    line_to_toggle,
-                    line_to_toggle,
-                    false,
-                    {}
-                )
-
-                comment.toggle_lines(line_to_toggle, line_to_toggle, {})
-            end
+    local lines_to_consider
+    local initial_line
+
+    lines_to_consider, initial_line = get_lines_to_handle(opts)
+
+    for count, line in ipairs(lines_to_consider) do
+        if string.find(line, global_opts.print_tag, 1, true) ~= nil then
+            local line_to_toggle = count + initial_line - 1
+            vim.api.nvim_buf_set_lines(
+                0,
+                line_to_toggle,
+                line_to_toggle,
+                false,
+                {}
+            )
+
+            utils.toggle_comment_line(line_to_toggle)
         end
-    else
-        vim.notify(
-            "mini.nvim is required to toggle comment debugprint lines",
-            vim.log.levels.ERROR,
-            {}
-        )
     end
 end
 

lua/debugprint/utils.lua

@@ -87,6 +87,26 @@ M.indent_line = function(line_nr, move_to_indented_line)
     end
 end
 
+M.toggle_comment_line = function(line)
+    if vim.fn.has("nvim-0.10.0") == 1 then
+        local pos = vim.api.nvim_win_get_cursor(0)
+        vim.cmd(line .. "norm gcc")
+        vim.api.nvim_win_set_cursor(0, pos)
+    else
+        local status, comment = pcall(require, "mini.comment")
+
+        if status == true then
+            comment.toggle_lines(line, line, {})
+        else
+            vim.notify_once(
+                "mini.nvim is required to toggle comment debugprint lines prior to NeoVim 0.10",
+                vim.log.levels.ERROR,
+                {}
+            )
+        end
+    end
+end
+
 M.NOOP = function() end
 
 M.set_callback = function(func_name)