fix(proselint): compatibility with proselint 0.16 (#308)

Author: JaRoSchm

lua/null-ls/builtins/code_actions/proselint.lua

@@ -13,27 +13,66 @@ return h.make_builtin({
     filetypes = { "markdown", "tex" },
     generator_opts = {
         command = "proselint",
-        args = { "--json" },
+        args = { "check", "--output-format=json" },
         format = "json",
         to_stdin = true,
         check_exit_code = function(c)
             return c <= 1
         end,
         on_output = function(params)
             local actions = {}
-            for _, d in ipairs(params.output.data.errors) do
-                if d.replacements ~= vim.NIL and params.row == d.line then
-                    local row = d.line - 1
-                    local col_beg = d.column - 1
-                    local col_end = d.column + d.extent - 2
-                    table.insert(actions, {
-                        title = d.message,
-                        action = function()
-                            vim.api.nvim_buf_set_text(params.bufnr, row, col_beg, row, col_end, { d.replacements })
-                        end,
-                    })
+
+            local output = params.output
+            if not output or output.error then
+                return actions
+            end
+
+            local result = output.result
+            if not result then
+                return actions
+            end
+
+            local buf = params.bufnr
+            local text = table.concat(vim.api.nvim_buf_get_lines(buf, 0, -1, false), "\n")
+
+            for _, file_output in pairs(result) do
+                if file_output.diagnostics then
+                    for _, d in ipairs(file_output.diagnostics) do
+                        if d.replacements and d.replacements ~= vim.NIL then
+                            -- byte offsets (1-based)
+                            local byte_start = d.span[1]
+                            local byte_end = d.span[2]
+
+                            -- turn into 0-based Lua string indices
+                            local sub = text:sub(byte_start, byte_end)
+
+                            -- find the (line, col) from byte indices
+                            local before = text:sub(1, byte_start - 1)
+                            local line = select(2, before:gsub("\n", "")) + 1
+                            local col = #before:match("[^\n]*$") + 1
+
+                            -- end col
+                            local length = #sub
+                            local end_col = col + length - 1
+
+                            table.insert(actions, {
+                                title = d.message,
+                                action = function()
+                                    vim.api.nvim_buf_set_text(
+                                        buf,
+                                        line - 1,
+                                        col - 1,
+                                        line - 1,
+                                        end_col,
+                                        { d.replacements }
+                                    )
+                                end,
+                            })
+                        end
+                    end
                 end
             end
+
             return actions
         end,
     },

lua/null-ls/builtins/diagnostics/proselint.lua

@@ -13,7 +13,7 @@ return h.make_builtin({
     filetypes = { "markdown", "tex" },
     generator_opts = {
         command = "proselint",
-        args = { "--json" },
+        args = { "check", "--output-format=json" },
         format = "json",
         to_stdin = true,
         check_exit_code = function(c)
@@ -26,16 +26,43 @@ return h.make_builtin({
                 warning = 2,
                 suggestion = 4,
             }
-            for _, d in ipairs(params.output.data.errors) do
-                table.insert(diags, {
-                    row = d.line,
-                    col = d.column,
-                    end_col = d.column + d.extent - 1,
-                    code = d.check,
-                    message = d.message,
-                    severity = sev[d.severity],
-                })
+
+            local output = params.output
+            if not output then
+                return diags
+            end
+
+            if output.error then
+                return diags
+            end
+
+            local result = output.result
+            if not result then
+                return diags
             end
+
+            for _, file_output in pairs(result) do
+                if file_output.diagnostics then
+                    for _, d in ipairs(file_output.diagnostics) do
+                        local line = d.pos[1]
+                        local col = d.pos[2]
+
+                        -- span = {start_col, end_col}
+                        local end_col = d.span[2]
+
+                        table.insert(diags, {
+                            row = line,
+                            col = col,
+                            end_col = end_col,
+                            code = d.check_path,
+                            message = d.message,
+                            -- Proselint no longer includes a severity -> choose warning
+                            severity = sev.warning,
+                        })
+                    end
+                end
+            end
+
             return diags
         end,
     },