feat: use width of extmarks for window width

Takes rendered virtual text into account when calculating window width.
Allows long titles to determine width

See #68

Author: rcarriga

lua/notify/render/base.lua

@@ -0,0 +1,9 @@
+local M = {}
+
+local namespace = vim.api.nvim_create_namespace("nvim-notify")
+
+function M.namespace()
+  return namespace
+end
+
+return M

lua/notify/render/default.lua

@@ -1,36 +1,48 @@
 local api = vim.api
 local config = require("notify.config")
-local namespace = api.nvim_create_namespace("nvim-notify")
+local base = require("notify.render.base")
 
 return function(bufnr, notif, highlights)
   local left_icon = notif.icon .. " "
-  local max_width = math.max(
-    math.max(unpack(vim.tbl_map(function(line)
-      return vim.fn.strchars(line)
-    end, notif.message))),
-    config.minimum_width()
-  )
-  local left_title = notif.title[1] .. string.rep(" ", max_width)
+  local max_message_width = math.max(math.max(unpack(vim.tbl_map(function(line)
+    return vim.fn.strchars(line)
+  end, notif.message))))
   local right_title = notif.title[2]
+  local left_title = notif.title[1]
+  local title_accum = vim.str_utfindex(left_icon)
+    + vim.str_utfindex(right_title)
+    + vim.str_utfindex(left_title)
+
+  local left_buffer = string.rep(" ", math.max(0, max_message_width - title_accum))
+
+  local namespace = base.namespace()
   api.nvim_buf_set_lines(bufnr, 0, 1, false, { "", "" })
   api.nvim_buf_set_extmark(bufnr, namespace, 0, 0, {
     virt_text = {
       { " " },
       { left_icon, highlights.icon },
-      { left_title, highlights.title },
+      { left_title .. left_buffer, highlights.title },
     },
     virt_text_win_col = 0,
-    priority = max_width,
+    priority = 10,
   })
   api.nvim_buf_set_extmark(bufnr, namespace, 0, 0, {
-    virt_text = { { right_title, highlights.title }, { " " } },
+    virt_text = { { " " }, { right_title, highlights.title }, { " " } },
     virt_text_pos = "right_align",
-    priority = max_width,
+    priority = 10,
   })
   api.nvim_buf_set_extmark(bufnr, namespace, 1, 0, {
-    virt_text = { { string.rep("━", max_width), highlights.border } },
+    virt_text = {
+      {
+        string.rep(
+          "━",
+          math.max(vim.str_utfindex(left_buffer) + title_accum + 2, config.minimum_width())
+        ),
+        highlights.border,
+      },
+    },
     virt_text_win_col = 0,
-    priority = max_width,
+    priority = 10,
   })
   api.nvim_buf_set_lines(bufnr, 2, -1, false, notif.message)
 

lua/notify/render/minimal.lua

@@ -1,7 +1,8 @@
 local api = vim.api
-local namespace = api.nvim_create_namespace("nvim-notify")
+local base = require("notify.render.base")
 
 return function(bufnr, notif, highlights)
+  local namespace = base.namespace()
   api.nvim_buf_set_lines(bufnr, 0, -1, false, notif.message)
 
   api.nvim_buf_set_extmark(bufnr, namespace, 0, 0, {

lua/notify/service/buffer/init.lua

@@ -106,6 +106,28 @@ function NotificationBuf:render()
   for _, line in pairs(lines) do
     width = math.max(width, vim.str_utfindex(line))
   end
+  local render_namespace = require("notify.render.base").namespace()
+  local success, extmarks = pcall(
+    api.nvim_buf_get_extmarks,
+    buf,
+    render_namespace,
+    0,
+    #lines,
+    { details = true }
+  )
+  if not success then
+    extmarks = {}
+  end
+  local virt_texts = {}
+  for _, mark in ipairs(extmarks) do
+    local details = mark[4]
+    for _, virt_text in ipairs(details.virt_text or {}) do
+      virt_texts[mark[2]] = (virt_texts[mark[2]] or "") .. virt_text[1]
+    end
+  end
+  for _, text in pairs(virt_texts) do
+    width = math.max(width, vim.str_utfindex(text))
+  end
 
   self._width = width
   self._height = #lines

tests/unit/init_spec.lua

@@ -82,10 +82,10 @@ describe("checking public interface", function()
   a.it("uses the confgured minimum width", function()
     notify.setup({
       background_colour = "#000000",
-      minimum_width = 10,
+      minimum_width = 20,
     })
     local win = notify.async("test").events.open()
-    assert.equal(vim.api.nvim_win_get_width(win), 10)
+    assert.equal(vim.api.nvim_win_get_width(win), 20)
   end)
 
   a.it("uses the configured max width", function()
@@ -109,4 +109,13 @@ describe("checking public interface", function()
     local win = notify.async("test").events.open()
     assert.equal(vim.api.nvim_win_get_height(win), 3)
   end)
+
+  a.it("renders title as longest line", function()
+    notify.setup({
+      background_colour = "#000000",
+      minimum_width = 10,
+    })
+    local win = notify.async("test", nil, { title = { string.rep("a", 16), "" } }).events.open()
+    assert.equal(21, vim.api.nvim_win_get_width(win))
+  end)
 end)