fix(utils): safely call :normal gggqG (fix #478)

rest-nvim · Sep 30, 2024 · be234c8 · be234c8
1 parent e9f9237
commit be234c8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/lua/rest-nvim/utils.lua b/lua/rest-nvim/utils.lua
@@ -327,7 +327,13 @@ function utils.gq_lines(lines, filetype)
         return lines, false
     end
     vim.api.nvim_buf_call(format_buf, function()
-        vim.cmd("silent normal gggqG")
+        -- HACK: dirty fix for neovim/neovim#30593
+        local gq_ok, res = pcall(vim.api.nvim_command, "silent normal gggqG")
+        if not gq_ok then
+            local msg = ("formatting %s filetype failed"):format(filetype)
+            logger.warn(msg, res)
+            vim.notify(msg, vim.log.levels.WARN, { title = "rest.nvim" })
+        end
     end)
     local buf_lines = vim.api.nvim_buf_get_lines(format_buf, 0, -1, false)
     vim.api.nvim_buf_delete(format_buf, { force = true })

diff --git a/spec/utils_spec.lua b/spec/utils_spec.lua
@@ -89,4 +89,14 @@ describe("gq_lines", function()
         local lines = {}
         assert.same({}, utils.gq_lines(lines, "json"))
     end)
+    it("handle format error #478 (neovim/neovim#30593)", function()
+        vim.api.nvim_create_autocmd("FileType", {
+            pattern = "json",
+            callback = function(ev)
+                vim.bo[ev.buf].formatprg = "jq --indent 4"
+            end,
+        })
+        local lines = { "" }
+        assert.same({ "" }, utils.gq_lines(lines, "json"))
+    end)
 end)