chore!: Remove support for NeoVim 0.8

NeoVim 0.10 is out now, so removing support for 0.8 since we are
supporting only one stable version back.

Author: andrewferrier

.github/workflows/tests.yaml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        neovim_branch: ["v0.8.3", "v0.9.5", "nightly"]
+        neovim_branch: ["v0.9.5", "v0.10.0", "nightly"]
 
     steps:
       - uses: actions/checkout@v4

README.md

@@ -57,7 +57,7 @@ updated and refreshed for the NeoVim generation. It has these features:
 
 ## Installation
 
-**Requires NeoVim 0.8+.**
+**Requires NeoVim 0.9+.**
 
 Example for [`lazy.nvim`](https://github.com/folke/lazy.nvim):
 
@@ -66,8 +66,7 @@ return {
     "andrewferrier/debugprint.nvim",
     opts = { … },
     dependencies = {
-        "echasnovski/mini.nvim", -- Needed to enable :ToggleCommentDebugPrints for NeoVim <= 0.9
-        "nvim-treesitter/nvim-treesitter" -- Needed to enable treesitter for NeoVim 0.8
+        "echasnovski/mini.nvim" -- Needed to enable :ToggleCommentDebugPrints for NeoVim <= 0.9
     },
     -- Remove the following line to use development versions,
     -- not just the formal releases
@@ -87,8 +86,7 @@ packer.startup(function(use)
             require("debugprint").setup(opts)
         end,
         requires = {
-            "echasnovski/mini.nvim", -- Needed to enable :ToggleCommentDebugPrints for NeoVim <= 0.9
-            "nvim-treesitter/nvim-treesitter" -- Needed to enable treesitter for NeoVim 0.8
+            "echasnovski/mini.nvim" -- Needed to enable :ToggleCommentDebugPrints for NeoVim <= 0.9
         }
     })
     …

lua/debugprint/init.lua

@@ -324,9 +324,9 @@ M.add_custom_filetypes = function(filetypes)
         vim.tbl_deep_extend("force", global_opts.filetypes, filetypes)
 end
 
-if vim.fn.has("nvim-0.8.0") ~= 1 then
+if vim.fn.has("nvim-0.9.0") ~= 1 then
     vim.notify_once(
-        "WARNING: debugprint.nvim is only compatible with NeoVim 0.8+",
+        "WARNING: debugprint.nvim is only compatible with NeoVim 0.9+",
         vim.log.levels.WARN
     )
 

lua/debugprint/utils.lua

@@ -1,42 +1,21 @@
 local M = {}
 
 local get_node_at_cursor = function()
-    if vim.fn.has("nvim-0.9.0") == 1 then
-        local success, is_node = pcall(vim.treesitter.get_node, {
-            ignore_injections = false,
-        })
-
-        -- This will fail if this language is not supported by Treesitter, e.g.
-        -- Powershell/ps1
-        if success and is_node then
-            return is_node
-        else
-            return nil
-        end
+    local success, is_node = pcall(vim.treesitter.get_node, {
+        ignore_injections = false,
+    })
+
+    -- This will fail if this language is not supported by Treesitter, e.g.
+    -- Powershell/ps1
+    if success and is_node then
+        return is_node
     else
-        local function requiref(module)
-            require(module)
-        end
-
-        local ts_utils_test = pcall(requiref, "nvim-treesitter.ts_utils")
-
-        if not ts_utils_test then
-            return nil
-        else
-            local ts_utils = require("nvim-treesitter.ts_utils")
-            return ts_utils.get_node_at_cursor()
-        end
+        return nil
     end
 end
 
 local get_node_text = function(node)
-    if vim.treesitter.get_node_text then
-        -- vim.treesitter.query.get_node_text deprecated as of NeoVim
-        -- 0.9
-        return vim.treesitter.get_node_text(node, 0)
-    else
-        return vim.treesitter.query.get_node_text(node, 0)
-    end
+    return vim.treesitter.get_node_text(node, 0)
 end
 
 M.is_modifiable = function()
@@ -155,17 +134,9 @@ M.get_effective_filetypes = function()
             })
             :lang()
 
-        if vim.fn.has("nvim-0.9.0") == 1 then
-            local filetypes =
-                vim.treesitter.language.get_filetypes(treesitter_lang)
-            assert(vim.tbl_count(filetypes) > 0)
-            return filetypes
-        else
-            -- nvim < 0.9 doesn't have get_filetypes; so just return the lang as
-            -- if it were a filetype. This will work for many languages (e.g.
-            -- lua), although not for others (e.g. tsx).
-            return { treesitter_lang }
-        end
+        local filetypes = vim.treesitter.language.get_filetypes(treesitter_lang)
+        assert(vim.tbl_count(filetypes) > 0)
+        return filetypes
     else
         return {
             vim.api.nvim_get_option_value("filetype", { scope = "local" }),

tests/debugprint.lua

@@ -490,19 +490,11 @@ describe("can do various file types", function()
 
         feedkeys("g?p")
 
-        if vim.fn.has("nvim-0.9.0") == 1 then
-            check_lines({
-                "foo",
-                "No debugprint configuration for filetype foo; see https://github.com/andrewferrier/debugprint.nvim?tab=readme-ov-file#add-custom-filetypes",
-                "bar",
-            })
-        else
-            check_lines({
-                "foo",
-                "/*No debugprint configuration for filetype foo; see https://github.com/andrewferrier/debugprint.nvim?tab=readme-ov-file#add-custom-filetypes*/",
-                "bar",
-            })
-        end
+        check_lines({
+            "foo",
+            "No debugprint configuration for filetype foo; see https://github.com/andrewferrier/debugprint.nvim?tab=readme-ov-file#add-custom-filetypes",
+            "bar",
+        })
     end)
 
     it(
@@ -534,19 +526,11 @@ describe("can do various file types", function()
         feedkeys("g?v")
         feedkeys("<CR>")
 
-        if vim.fn.has("nvim-0.9.0") == 1 then
-            check_lines({
-                "foo",
-                "No debugprint configuration for filetype foo; see https://github.com/andrewferrier/debugprint.nvim?tab=readme-ov-file#add-custom-filetypes",
-                "bar",
-            })
-        else
-            check_lines({
-                "foo",
-                "/*No debugprint configuration for filetype foo; see https://github.com/andrewferrier/debugprint.nvim?tab=readme-ov-file#add-custom-filetypes*/",
-                "bar",
-            })
-        end
+        check_lines({
+            "foo",
+            "No debugprint configuration for filetype foo; see https://github.com/andrewferrier/debugprint.nvim?tab=readme-ov-file#add-custom-filetypes",
+            "bar",
+        })
     end)
 end)
 
@@ -1718,110 +1702,105 @@ describe("check python indenting", function()
     end)
 end)
 
-if vim.fn.has("nvim-0.9.0") == 1 then
-    -- This test will not work on NeoVim <= 0.8, I think because markdown only
-    -- supports a limited range of embedded langs
-
-    describe("embedded treesitter langs", function()
-        before_each(function()
-            debugprint.setup({ ignore_treesitter = false })
-        end)
+describe("embedded treesitter langs", function()
+    before_each(function()
+        debugprint.setup({ ignore_treesitter = false })
+    end)
 
-        after_each(teardown)
+    after_each(teardown)
 
-        it("lua in markdown", function()
-            local filename = init_file({
-                "foo",
-                "```lua",
-                "x = 1",
-                "```",
-                "bar",
-            }, "markdown", 3, 0)
+    it("lua in markdown", function()
+        local filename = init_file({
+            "foo",
+            "```lua",
+            "x = 1",
+            "```",
+            "bar",
+        }, "markdown", 3, 0)
 
-            feedkeys("g?p")
+        feedkeys("g?p")
 
-            check_lines({
-                "foo",
-                "```lua",
-                "x = 1",
-                "print('DEBUGPRINT[1]: " .. filename .. ":3 (after x = 1)')",
-                "```",
-                "bar",
-            })
-        end)
+        check_lines({
+            "foo",
+            "```lua",
+            "x = 1",
+            "print('DEBUGPRINT[1]: " .. filename .. ":3 (after x = 1)')",
+            "```",
+            "bar",
+        })
+    end)
 
-        it("lua in markdown above", function()
-            local filename = init_file({
-                "foo",
-                "```lua",
-                "x = 1",
-                "```",
-                "bar",
-            }, "markdown", 3, 0)
+    it("lua in markdown above", function()
+        local filename = init_file({
+            "foo",
+            "```lua",
+            "x = 1",
+            "```",
+            "bar",
+        }, "markdown", 3, 0)
 
-            feedkeys("g?P")
+        feedkeys("g?P")
 
-            check_lines({
-                "foo",
-                "```lua",
-                "print('DEBUGPRINT[1]: " .. filename .. ":3 (before x = 1)')",
-                "x = 1",
-                "```",
-                "bar",
-            })
-        end)
+        check_lines({
+            "foo",
+            "```lua",
+            "print('DEBUGPRINT[1]: " .. filename .. ":3 (before x = 1)')",
+            "x = 1",
+            "```",
+            "bar",
+        })
+    end)
 
-        it("javascript in html", function()
-            local filename = init_file({
-                "<html>",
-                "<body>",
-                "<script>",
-                "    let x = 3;",
-                "",
-                "    console.log(x);",
-                "</script>",
-                "</body>",
-                "</html>",
-            }, "html", 6, 0)
+    it("javascript in html", function()
+        local filename = init_file({
+            "<html>",
+            "<body>",
+            "<script>",
+            "    let x = 3;",
+            "",
+            "    console.log(x);",
+            "</script>",
+            "</body>",
+            "</html>",
+        }, "html", 6, 0)
 
-            feedkeys("g?p")
+        feedkeys("g?p")
 
-            check_lines({
-                "<html>",
-                "<body>",
-                "<script>",
-                "    let x = 3;",
-                "",
-                "    console.log(x);",
-                '    console.warn("DEBUGPRINT[1]: '
-                    .. filename
-                    .. ':6 (after console.log(x);)")',
-                "</script>",
-                "</body>",
-                "</html>",
-            })
-        end)
+        check_lines({
+            "<html>",
+            "<body>",
+            "<script>",
+            "    let x = 3;",
+            "",
+            "    console.log(x);",
+            '    console.warn("DEBUGPRINT[1]: '
+                .. filename
+                .. ':6 (after console.log(x);)")',
+            "</script>",
+            "</body>",
+            "</html>",
+        })
+    end)
 
-        it("comment in lua", function()
-            local filename = init_file({
-                "x = 3",
-                "-- abc",
-                "a = 2",
-            }, "lua", 2, 4)
+    it("comment in lua", function()
+        local filename = init_file({
+            "x = 3",
+            "-- abc",
+            "a = 2",
+        }, "lua", 2, 4)
 
-            feedkeys("g?v<CR>")
+        feedkeys("g?v<CR>")
 
-            check_lines({
-                "x = 3",
-                "-- abc",
-                "print('DEBUGPRINT[1]: "
-                    .. filename
-                    .. ":2: abc=' .. vim.inspect(abc))",
-                "a = 2",
-            })
-        end)
+        check_lines({
+            "x = 3",
+            "-- abc",
+            "print('DEBUGPRINT[1]: "
+                .. filename
+                .. ":2: abc=' .. vim.inspect(abc))",
+            "a = 2",
+        })
     end)
-end
+end)
 
 describe("comment toggle", function()
     after_each(teardown)