feat(notify): use nvim_echo instead of vim.notify

Author: ibhagwan

lua/fzf-lua/actions.lua

@@ -233,7 +233,7 @@ M.vimcmd_entry = function(_vimcmd, selected, opts, pcall_vimcmd)
         end
         if pcall_vimcmd ~= false then
           local ok, err = pcall(function() vim.cmd(vimcmd) end)
-          if not ok then utils.warn(string.format("':%s' failed: %s", vimcmd, err)) end
+          if not ok then utils.error("':%s' failed: %s", vimcmd, err) end
         else
           vim.cmd(vimcmd)
         end
@@ -514,7 +514,7 @@ end
 M.toggle_bg = function(_, _)
   vim.o.background = vim.o.background == "dark" and "light" or "dark"
   utils.setup_highlights()
-  utils.info(string.format([[background set to "%s"]], vim.o.background))
+  utils.info([[background set to '%s']], vim.o.background)
 end
 
 M.hi = function(selected)
@@ -789,7 +789,7 @@ M.git_switch = function(selected, opts)
   table.insert(cmd, branch)
   local output, rc = utils.io_systemlist(cmd)
   if rc ~= 0 then
-    utils.err(unpack(output))
+    utils.error(unpack(output))
   else
     utils.info(unpack(output))
     vim.cmd("checktime")
@@ -809,9 +809,9 @@ M.git_branch_add = function(selected, opts)
     table.insert(cmd_add_branch, branch)
     local output, rc = utils.io_systemlist(cmd_add_branch)
     if rc ~= 0 then
-      utils.err(unpack(output))
+      utils.error(unpack(output))
     else
-      utils.info(string.format("Created branch '%s'.", branch))
+      utils.info("Created branch '%s'.", branch)
     end
   end
 end
@@ -823,14 +823,14 @@ M.git_branch_del = function(selected, opts)
   local branch = selected[1]:match("[^%s%*]+")
   local cur_branch = utils.io_systemlist(cmd_cur_branch)[1]
   if branch == cur_branch then
-    utils.warn(string.format("Cannot delete active branch '%s'", branch))
+    utils.warn("Cannot delete active branch '%s'", branch)
     return
   end
   if vim.fn.confirm("Delete branch " .. branch .. "?", "&Yes\n&No") == 1 then
     table.insert(cmd_del_branch, branch)
     local output, rc = utils.io_systemlist(cmd_del_branch)
     if rc ~= 0 then
-      utils.err(unpack(output))
+      utils.error(unpack(output))
     else
       utils.info(unpack(output))
     end
@@ -857,8 +857,15 @@ M.git_yank_commit = function(selected, opts)
     vim.fn.setreg(reg, commit_hash)
   end
   vim.fn.setreg([[0]], commit_hash)
-  utils.info(string.format("commit hash %s copied to register %s, use 'p' to paste.",
-    commit_hash, regs[1]))
+  utils.info({
+    "commit hash ",
+    { commit_hash, "DiagnosticVirtualLinesWarn" },
+    " copied to register ",
+    { regs[1],     "DiagnosticVirtualLinesHint" },
+    ", use '",
+    { "p", "DiagnosticVirtualLinesHint" },
+    "' to paste.",
+  })
 end
 
 M.git_checkout = function(selected, opts)
@@ -871,7 +878,7 @@ M.git_checkout = function(selected, opts)
     table.insert(cmd_checkout, commit_hash)
     local output, rc = utils.io_systemlist(cmd_checkout)
     if rc ~= 0 then
-      utils.err(unpack(output))
+      utils.error(unpack(output))
     else
       utils.info(unpack(output))
       vim.cmd("checktime")
@@ -887,7 +894,7 @@ local git_exec = function(selected, opts, cmd, silent)
     table.insert(_cmd, file)
     local output, rc = utils.io_systemlist(_cmd)
     if rc ~= 0 and not silent then
-      utils.err(unpack(output) or string.format("exit code %d", rc))
+      utils.error(unpack(output) or string.format("exit code %d", rc))
     end
     success = rc == 0
   end
@@ -1064,10 +1071,9 @@ M.tmux_buf_set_reg = function(selected, opts)
     opts.register = opts.register or [["]]
     local ok, err = pcall(vim.fn.setreg, opts.register, data)
     if ok then
-      utils.info(string.format("%d characters copied into register %s",
-        #data, opts.register))
+      utils.info("%d characters copied into register %s", #data, opts.register)
     else
-      utils.err(string.format("setreg(%s) failed: %s", opts.register, err))
+      utils.error("setreg(%s) failed: %s", opts.register, err)
     end
   end
 end

lua/fzf-lua/cmd.lua

@@ -11,7 +11,7 @@ function M.run_command(cmd, ...)
   cmd = cmd or "builtin"
 
   if not builtin[cmd] then
-    utils.info(string.format("invalid command '%s'", cmd))
+    utils.error("invalid command '%s'", cmd)
     return
   end
 

lua/fzf-lua/config.lua

@@ -674,18 +674,18 @@ function M.normalize_opts(opts, globals, __resume_key)
     opts.__FZF_VERSION = FZF_VERSION
     vim.g.fzf_lua_fzf_version = FZF_VERSION
     if not opts.__FZF_VERSION then
-      utils.err(string.format("'fzf --version' failed with error %s: %s", rc, err))
+      utils.error("'fzf --version' failed with error %s: %s", rc, err)
       return nil
     elseif not utils.has(opts, "fzf", { 0, 36 }) then
-      utils.err(string.format("fzf version %s is lower than minimum (0.36), aborting.",
-        utils.ver2str(opts.__FZF_VERSION)))
+      utils.error("fzf version %s is lower than minimum (0.36), aborting.",
+        utils.ver2str(opts.__FZF_VERSION))
       return nil
     end
   else
     local SK_VERSION, rc, err = utils.sk_version(opts)
     opts.__SK_VERSION = SK_VERSION
     if not opts.__SK_VERSION then
-      utils.err(string.format("'sk --version' failed with error %s: %s", rc, err))
+      utils.error("'sk --version' failed with error %s: %s", rc, err)
       return nil
     end
   end
@@ -782,12 +782,12 @@ function M.normalize_opts(opts, globals, __resume_key)
       end
     end)()
     local function warn(flag, val, min_ver)
-      return utils.warn(string.format("Removed flag '%s%s', %s.",
+      return utils.warn("Removed flag '%s%s', %s.",
         flag, type(val) == "string" and "=" .. val or "",
         not min_ver and string.format("not supported with %s", bin)
         or string.format("only supported with %s v%s (has=%s)",
           bin, utils.ver2str(min_ver), utils.ver2str(version))
-      ))
+      )
     end
     for min_verstr, ver_data in pairs(changelog) do
       for flag, non_compat_value in pairs(ver_data.fzf_opts) do
@@ -872,8 +872,8 @@ function M.normalize_opts(opts, globals, __resume_key)
       -- don't display the warning unless the user specifically set
       -- file_icons to `true` or `mini|devicons`
       if not tonumber(opts.file_icons) then
-        utils.warn(string.format("error loading '%s', disabling 'file_icons'.",
-          opts.file_icons == "mini" and "mini.icons" or "nvim-web-devicons"))
+        utils.warn("error loading '%s', disabling 'file_icons'.",
+          opts.file_icons == "mini" and "mini.icons" or "nvim-web-devicons")
       end
       opts.file_icons = nil
     end

lua/fzf-lua/core.lua

@@ -259,7 +259,7 @@ M.fzf_wrap = function(cmd, opts, convert_actions)
     if err and err:match("Vim%(edit%):E325") then
       return
     end
-    utils.err("fn_selected threw an error: " .. debug.traceback(err, 1))
+    utils.error("fn_selected threw an error: " .. debug.traceback(err, 1))
   end)
   -- Do not strt fzf, return the stringified contents and opts onlu
   -- used by the "combine" picker to merge inputs
@@ -678,8 +678,8 @@ M.build_fzf_cli = function(opts, fzf_win)
               v = [["]] .. v:sub(2, #v - 1) .. [["]]
             end
             if libuv.is_escaped(v) then
-              utils.warn(string.format("`fzf_opts` are automatically shellescaped."
-                .. " Please remove surrounding quotes from %s=%s", k, v))
+              utils.warn("`fzf_opts` are automatically shellescaped."
+                .. " Please remove surrounding quotes from %s=%s", k, v)
             end
             opt_v = libuv.is_escaped(v) and v or libuv.shellescape(v)
           end

lua/fzf-lua/devicons.lua

@@ -105,7 +105,7 @@ function NvimWebDevicons:load_icons(opts)
   end)
   if not ok or not all_devicons or utils.tbl_isempty(all_devicons) then
     -- something is wrong with devicons
-    utils.err("devicons.get_icons() is nil or empty!")
+    utils.error("devicons.get_icons() is nil or empty!")
     return
   end
   local icons = {

lua/fzf-lua/previewer/builtin.lua

@@ -78,7 +78,7 @@ function TSContext.inc_dec_maxlines(num, winid, bufnr)
   local config = require("treesitter-context.config")
   local max_lines = config.max_lines or 0
   config.max_lines = math.max(0, max_lines + tonumber(num))
-  utils.info(string.format("treesitter-context `max_lines` set to %d.", config.max_lines))
+  utils.info("treesitter-context `max_lines` set to %d.", config.max_lines)
   if TSContext.is_attached(winid) then
     for _, t in ipairs({ 0, 20 }) do
       vim.defer_fn(function() TSContext.update(winid, bufnr) end, t)
@@ -93,7 +93,7 @@ end
 function TSContext.update(winid, bufnr, opts)
   opts = opts or {}
   if not TSContext.setup(opts) then return end
-  assert(bufnr == vim.api.nvim_win_get_buf(winid))
+  assert(not vim.api.nvim_win_is_valid(winid) or bufnr == vim.api.nvim_win_get_buf(winid))
   local render = require("treesitter-context.render")
   local context_ranges, context_lines = require("treesitter-context.context").get(winid)
   if not context_ranges or #context_ranges == 0 then
@@ -965,8 +965,7 @@ local ts_attach = function(bufnr, ft)
   if lang and loaded then
     local ok, err = pcall(vim.treesitter.start, bufnr, lang)
     if not ok then
-      utils.warn(string.format(
-        "unable to attach treesitter highlighter for filetype '%s': %s", ft, err))
+      utils.warn("unable to attach treesitter highlighter for filetype '%s': %s", ft, err)
     end
     return ok
   end
@@ -1104,12 +1103,12 @@ function Previewer.buffer_or_file:do_syntax(entry)
     syntax_limit_reached = 2
   end
   if syntax_limit_reached > 0 and self.opts.silent == false then
-    utils.info(string.format(
+    utils.info(
       "syntax disabled for '%s' (%s), consider increasing '%s(%d)'", entry.path,
       syntax_limit_reached == 1 and ("%d lines"):format(lcount) or ("%db"):format(bytes),
       syntax_limit_reached == 1 and "syntax_limit_l" or "syntax_limit_b",
       syntax_limit_reached == 1 and self.syntax_limit_l or self.syntax_limit_b
-    ))
+    )
   end
 
   if syntax_limit_reached ~= 0 then
@@ -1246,9 +1245,9 @@ function Previewer.buffer_or_file:set_cursor_hl(entry)
         regex_end = tonumber(regex_end) and regex_end - regex_start
         regex_start = tonumber(regex_start) and regex_start + math.max(1, col) or 0
       elseif self.opts.silent ~= true then
-        utils.warn(string.format(
+        utils.warn(
           [[Unable to init vim.regex with "%s", %s. . Add 'silent=true' to hide this message.]],
-          regex, reg))
+          regex, reg)
       end
       if regex_start > 0 then
         self.match_id = fn.matchaddpos(self.win.hls.search, { { lnum, regex_start, regex_end } }, 11)

lua/fzf-lua/providers/buffers.lua

@@ -479,8 +479,7 @@ M.treesitter = function(opts)
   local ft = vim.bo[bufnr0].ft
   local lang = ts.language.get_lang(ft) or ft
   if not utils.has_ts_parser(lang) then
-    utils.info(string.format("No treesitter parser found for '%s' (bufnr=%d).",
-      bufname0, bufnr0))
+    utils.info("No treesitter parser found for '%s' (bufnr=%d).", bufname0, bufnr0)
     return
   end
 

lua/fzf-lua/providers/colorschemes.lua

@@ -152,13 +152,12 @@ function AsyncDownloadManager:new(opts)
   self.max_threads = tonumber(opts.max_threads) > 0 and tonumber(opts.max_threads) or 5
   local stat, _ = uv.fs_stat(self.path)
   if stat and stat.type ~= "directory" then
-    utils.warn(string.format(
-      [["%s" already exists and is not a directory (type:%s)]], self.path, stat.type))
+    utils.error([["%s" already exists and is not a directory (type:%s)]], self.path, stat.type)
     return
   end
   if not stat then
     if vim.fn.mkdir(self.path, "p") ~= 1 then
-      utils.warn(string.format([[Unable to create cache directory "%s"]], self.path))
+      utils.error([[Unable to create cache directory "%s"]], self.path)
       return
     end
   end
@@ -192,11 +191,11 @@ function AsyncDownloadManager:load_db(db)
   self.db = db
   for k, p in pairs(self.db or {}) do
     if type(p.url) ~= "string" then
-      utils.warn(string.format("package %s: missing 'url'", k))
+      utils.warn("package %s: missing 'url'", k)
       return false
     end
     if type(p.colorschemes) ~= "table" or utils.tbl_isempty(p.colorschemes) then
-      utils.warn(string.format("package %s: missing or empty 'colorschemes'", k))
+      utils.warn("package %s: missing or empty 'colorschemes'", k)
       return false
     end
     local github_url = "https://github.com/"
@@ -215,8 +214,7 @@ function AsyncDownloadManager:load_db(db)
     for i, v in ipairs(p.colorschemes) do
       p.colorschemes[i].disp_name = v.disp_name or p.disp_name
       if not v.name and not v.lua and not v.vim then
-        utils.warn(string.format(
-          "package %s: colorschemes[%d], must contain at least 'name|lua|vim'", k, i))
+        utils.warn("package %s: colorschemes[%d], must contain at least 'name|lua|vim'", k, i)
         return false
       end
     end
@@ -298,7 +296,7 @@ function AsyncDownloadManager:jobstart(plugin, job_args)
   job_args[2] = vim.tbl_extend("keep", job_args[2] or {},
     {
       on_exit = function(_, rc, _)
-        utils.info(string.format("%s [job_id:%d] finished with exit code %s", plugin, job_id, rc))
+        utils.info("%s [job_id:%d] finished with exit code %s", plugin, job_id, rc)
         if type(info.on_exit) == "function" then
           -- this calls `coroutine.resume` and resumes fzf's reload input stream
           info.on_exit(_, rc, _)
@@ -313,11 +311,10 @@ function AsyncDownloadManager:jobstart(plugin, job_args)
   if job_id == 0 then
     utils.warn("jobstart: invalid args")
   elseif job_id == -1 then
-    utils.warn(string.format([[jobstart: "%s" is not executable]], job_args[1]))
+    utils.warn([[jobstart: "%s" is not executable]], job_args[1])
   else
     -- job started successfully
-    utils.info(string.format("%s [path:%s] [job_id:%d]...",
-      msg, path.HOME_to_tilde(assert(info.path)), job_id))
+    utils.info("%s [path:%s] [job_id:%d]...", msg, path.HOME_to_tilde(assert(info.path)), job_id)
     self.job_ids[tostring(job_id)] = { plugin = plugin, args = job_args }
     self.db[plugin].job_id = job_id
   end
@@ -352,7 +349,7 @@ M.apply_awesome_theme = function(dbkey, idx, opts)
   -- TODO: should we check `package.loaded[...]` before packadd?
   local ok, out = pcall(function() vim.cmd("packadd " .. p.dir) end)
   if not ok then
-    utils.warn(string.format("Unable to packadd  %s: %s", p.dir, tostring(out)))
+    utils.error("Unable to packadd  %s: %s", p.dir, tostring(out))
     return
   end
   if cs.vim then
@@ -363,7 +360,7 @@ M.apply_awesome_theme = function(dbkey, idx, opts)
     ok, out = pcall(function() vim.cmd("colorscheme " .. cs.name) end)
   end
   if not ok then
-    utils.warn(string.format("Unable to apply colorscheme %s: %s", cs.disp_name, tostring(out)))
+    utils.error("Unable to apply colorscheme %s: %s", cs.disp_name, tostring(out))
   end
 end
 
@@ -382,13 +379,13 @@ M.awesome_colorschemes = function(opts)
 
   local json_string = utils.read_file(dbfile)
   if not json_string or #json_string == 0 then
-    utils.warn(string.format("Unable to load json db (%s)", opts.dbfile))
+    utils.error("Unable to load json db (%s)", opts.dbfile)
     return
   end
 
   local ok, json_db = pcall(vim.json.decode, json_string)
   if not ok then
-    utils.warn(string.format("Json decode failed: %s", json_db))
+    utils.error(string.format("Json decode failed: %s", json_db))
     return
   end
 

lua/fzf-lua/providers/diagnostic.lua

@@ -153,7 +153,7 @@ M.diagnostics = function(opts)
     end
   end
   if not has_diags then
-    utils.info(string.format("No %s found", "diagnostics"))
+    utils.info("No %s found", "diagnostics")
     return
   end
 

lua/fzf-lua/providers/git.lua

@@ -92,7 +92,7 @@ M.diff = function(opts)
   local cmd = path.git_cwd({ "git", "rev-parse", "--verify", opts.ref }, opts)
   local _, err = utils.io_systemlist(cmd)
   if err ~= 0 then
-    utils.warn(string.format("Invalid git ref %s", opts.ref))
+    utils.warn("Invalid git ref %s", opts.ref)
     return
   end
   for _, k in ipairs({ "cmd", "preview" }) do
@@ -246,7 +246,7 @@ M.hunks = function(opts)
   local cmd = path.git_cwd({ "git", "rev-parse", "--verify", opts.ref }, opts)
   local _, err = utils.io_systemlist(cmd)
   if err ~= 0 then
-    utils.warn(string.format("Invalid git ref %s", opts.ref))
+    utils.warn("Invalid git ref %s", opts.ref)
     return
   end
   opts.cmd = opts.cmd:gsub("[<{]ref[}>]", opts.ref)