chore: minor cleanup

Author: boltlessengineer

lua/rest-nvim/config/init.lua

@@ -219,12 +219,12 @@ config = vim.tbl_deep_extend("force", {
 local ok, err = check.validate(config)
 
 if not ok then
-  vim.notify("Rest.nvim: " .. err, vim.log.levels.ERROR)
+  vim.notify("[rest.nvim] " .. err, vim.log.levels.ERROR)
 end
 
 if #config._debug_info.unrecognized_configs > 0 then
   vim.notify(
-    "Unrecognized configs found in setup: " .. vim.inspect(config._debug_info.unrecognized_configs),
+    "[rest.nvim] Unrecognized configs found in setup: " .. vim.inspect(config._debug_info.unrecognized_configs),
     vim.log.levels.WARN
   )
 end

lua/rest-nvim/cookie_jar.lua

@@ -38,7 +38,7 @@ function M.load_jar()
     if seps[1] ~= "" and not vim.startswith(seps[1], "#") then
       if #seps ~= 5 then
         local err_msg = "error while parsing cookies file at line:\n" .. line .. "\n"
-        vim.notify(err_msg, vim.log.levels.ERROR)
+        vim.notify("[rest.nvim] " .. err_msg, vim.log.levels.ERROR)
         logger.error(err_msg)
         return
       end
@@ -161,7 +161,7 @@ function M.save_jar()
   local file, openerr = io.open(config.cookies.path, "w")
   if not file then
     local err_msg = string.format("Failed to open rest.nvim cookies file: %s", openerr)
-    vim.notify(err_msg, vim.log.levels.ERROR)
+    vim.notify("[rest.nvim] " ..err_msg, vim.log.levels.ERROR)
     logger.error(err_msg)
     return
   end

lua/rest-nvim/dotenv.lua

@@ -22,7 +22,7 @@ function M.load_file(path, setter)
   end
   local ok = dotenv_parser.parse(path, setter)
   if not ok then
-    vim.notify("failed to load file '" .. path .. "'", vim.log.levels.WARN)
+    vim.notify("[rest.nvim] failed to load file '" .. path .. "'", vim.log.levels.WARN)
   end
 end
 
@@ -35,17 +35,17 @@ function M.register_file(path, bufnr)
   -- TODO: validate file extension
   bufnr = bufnr or 0
   vim.b[bufnr]._rest_nvim_env_file = path
-  vim.notify("Env file '" .. path .. "' has been registered")
+  vim.notify("[rest.nvim] Env file '" .. path .. "' has been registered")
 end
 
 ---show registered dotenv file for current buffer
 ---@param bufnr number? buffer identifier, default to current buffer
 function M.show_registered_file(bufnr)
   bufnr = bufnr or 0
   if not vim.b[bufnr]._rest_nvim_env_file then
-    vim.notify("No env file is used in current buffer", vim.log.levels.WARN)
+    vim.notify("[rest.nvim] No env file is used in current buffer", vim.log.levels.WARN)
   else
-    vim.notify("Current env file in use: " .. vim.b._rest_nvim_env_file, vim.log.levels.INFO)
+    vim.notify("[rest.nvim] Current env file in use: " .. vim.b._rest_nvim_env_file, vim.log.levels.INFO)
   end
 end
 

lua/rest-nvim/health.lua

@@ -19,7 +19,7 @@ local function install_health()
   local found_luarocks_nvim = package.searchpath("luarocks", package.path)
 
   if vim.fn.executable("luarocks") ~= 1 and not vim.g.rocks_nvim_loaded and not found_luarocks_nvim then
-    vim.health.error("`Luarocks` is not installed in your system")
+    vim.health.warn("`Luarocks` is not installed in your system", "Are you sure you installed all needed dependencies properly?")
   else
     vim.health.ok("Found `luarocks` installed in your system")
   end
@@ -66,7 +66,7 @@ local function configuration_health()
   end
 
   -- Formatters
-  local formatters = config.result.behavior.formatters
+  local formatters = config.response.formatters
   for ft, formatter in pairs(formatters) do
     if type(formatter) == "string" then
       if vim.fn.executable(formatter) ~= 1 then
@@ -83,7 +83,7 @@ local function configuration_health()
         )
       end
     elseif type(formatter) == "function" then
-      local _, fmt_meta = formatter()
+      local _, fmt_meta = formatter("")
       if not fmt_meta.found then
         vim.health.warn(
           "Formatter for `"

lua/rest-nvim/request.lua

@@ -46,7 +46,7 @@ local function run_request(req)
     local ok, res = pcall(client.request(req).wait)
     if not ok then
       logger.error("request failed")
-      vim.notify("request failed", vim.log.levels.ERROR)
+      vim.notify("[rest.nvim] request failed", vim.log.levels.ERROR)
       return
     end
     ---@cast res rest.Response
@@ -83,7 +83,7 @@ function M.run()
   local req_node = parser.get_cursor_request_node()
   if not req_node then
     logger.error("failed to find request at cursor position")
-    vim.notify("failed to find request at cursor position", vim.log.levels.ERROR)
+    vim.notify("[rest.nvim] failed to find request at cursor position", vim.log.levels.ERROR)
     return
   end
   local ctx = parser.create_context(0)
@@ -93,7 +93,7 @@ function M.run()
   local req = parser.parse(req_node, 0, ctx)
   if not req then
     logger.error("failed to parse request")
-    vim.notify("failed to parse request", vim.log.levels.ERROR)
+    vim.notify("[rest.nvim] failed to parse request", vim.log.levels.ERROR)
     return
   end
   local highlight = config.highlight
@@ -108,7 +108,7 @@ function M.run_by_name(name)
   local req_node = parser.get_request_node_by_name(name)
   if not req_node then
     logger.error("failed to find request by name: " .. name)
-    vim.notify("failed to find request by name: " .. name, vim.log.levels.ERROR)
+    vim.notify("[rest.nvim] failed to find request by name: " .. name, vim.log.levels.ERROR)
     return
   end
   local ctx = parser.create_context(0)
@@ -118,7 +118,7 @@ function M.run_by_name(name)
   local req = parser.parse(req_node, 0, ctx)
   if not req then
     logger.error("failed to parse request")
-    vim.notify("failed to parse request", vim.log.levels.ERROR)
+    vim.notify("[rest.nvim] failed to parse request", vim.log.levels.ERROR)
     return
   end
   local highlight = config.highlight
@@ -132,7 +132,7 @@ end
 function M.run_last()
   local req = rest_nvim_last_request
   if not req then
-    vim.notify("No last request found", vim.log.levels.WARN)
+    vim.notify("[rest.nvim] No last request found", vim.log.levels.WARN)
     return false
   end
   run_request(req)
@@ -145,13 +145,13 @@ function M.run_all()
   for _, req_node in ipairs(reqs) do
     local req = parser.parse(req_node, 0, ctx)
     if not req then
-      vim.notify("Parsing request failed. See `:Rest logs` for more info", vim.log.levels.ERROR)
+      vim.notify("[rest.nvim] Parsing request failed. See `:Rest logs` for more info", vim.log.levels.ERROR)
       return false
     end
     -- FIXME: wait for previous request ends
     local ok = run_request(req)
     if not ok then
-      vim.notify("Running request failed. See `:Rest logs` for more info", vim.log.levels.ERROR)
+      vim.notify("[rest.nvim] Running request failed. See `:Rest logs` for more info", vim.log.levels.ERROR)
       return
     end
   end

lua/rest-nvim/response.lua

@@ -45,7 +45,7 @@ function response.try_format_body(content_type, body)
           body = sc.stdout --[[@as string]]
         else
           logger.error("Error running formatter '" .. fmt .. "' on response body:\n" .. sc.stderr)
-          vim.notify("Formatting response body failed. See `:Rest logs` for more info", vim.log.levels.ERROR)
+          vim.notify("[rest.nvim] Formatting response body failed. See `:Rest logs` for more info", vim.log.levels.ERROR)
         end
       end
     elseif res_type ~= nil then

lua/rest-nvim/ui/help.lua

@@ -31,7 +31,7 @@ local function get_or_create_buf()
   if not existing_buf then
     -- Create a new buffer
     local new_bufnr = vim.api.nvim_create_buf(false, true)
-    local keybinds = config.result.keybinds
+    local keybinds = config.ui.keybinds
     vim.api.nvim_buf_set_name(new_bufnr, tmp_name)
     vim.api.nvim_set_option_value("ft", "markdown", { buf = new_bufnr })
     vim.api.nvim_set_option_value("buftype", "nofile", { buf = new_bufnr })

plugin/rest-nvim.lua

@@ -16,17 +16,17 @@ local rest_nvim_deps = {}
 -- Locate dependencies
 local dependencies = {
   ["nvim-nio"] = "rest.nvim will not work asynchronously",
-  ["lua-curl"] = "Default HTTP client won't work",
   xml2lua = "rest.nvim will be completely unable to use XML bodies in your requests",
   mimetypes = "rest.nvim will be completely unable to recognize the file type of external body files",
+  ["fidget.nvim"] = "rest.nvim will be completely unable to show request progress messages",
 }
 for dep, err in pairs(dependencies) do
   local found_dep
   -- Both nvim-nio and lua-curl has a different Lua module name
   if dep == "nvim-nio" then
     found_dep = package.searchpath("nio", package.path)
-  elseif dep == "lua-curl" then
-    found_dep = package.searchpath("cURL.safe", package.path)
+  elseif dep == "fidget.nvim" then
+    found_dep = package.searchpath("fidget", package.path)
   else
     found_dep = package.searchpath(dep, package.path)
   end
@@ -38,8 +38,8 @@ for dep, err in pairs(dependencies) do
     -- Both nvim-nio and lua-curl has a different Lua module name
     if dep == "nvim-nio" then
       found_dep2 = pcall(require, "nio")
-    elseif dep == "lua-curl" then
-      found_dep2 = pcall(require, "cURL.safe")
+    elseif dep == "fidget.nvim" then
+      found_dep2 = pcall(require, "fidget")
     else
       found_dep2 = pcall(require, dep)
     end