fix(config): normalize partial table configs, fix multiple diagnostics icons, add support overriding open_float (#172)

* fix(config): remove inconsistent config instantiations

* fix(config): support overriding open_float with config option

* fix(config): support overriding open_float 

* Update README.md

* Update vimdoc

Author: r4zendev

README.md

@@ -358,7 +358,17 @@ vim.keymap.set("n", "<leader>dt", "<cmd>TinyInlineDiag toggle<cr>", { desc = "To
 
 ### Auto-Disable on Float
 
-To automatically hide inline diagnostics when opening Neovim's diagnostic float windows, override the function to disable diagnostics before opening the float and re-enable them after closing.
+To automatically hide inline diagnostics when opening Neovim's diagnostic float windows, enable the `override_open_float` option:
+
+```lua
+require("tiny-inline-diagnostic").setup({
+    options = {
+        override_open_float = true,
+    },
+})
+```
+
+Alternatively, you can manually override the function:
 
 ```lua
 vim.diagnostic.open_float = require("tiny-inline-diagnostic.override").open_float

doc/tiny-inline-diagnostic.nvim.txt

@@ -390,8 +390,17 @@ You can map these to keybindings for quick access:
 AUTO-DISABLE ON FLOAT ~
 
 To automatically hide inline diagnostics when opening Neovim’s diagnostic
-float windows, override the function to disable diagnostics before opening the
-float and re-enable them after closing.
+float windows, enable the `override_open_float` option:
+
+>lua
+    require("tiny-inline-diagnostic").setup({
+        options = {
+            override_open_float = true,
+        },
+    })
+<
+
+Alternatively, you can manually override the function:
 
 >lua
     vim.diagnostic.open_float = require("tiny-inline-diagnostic.override").open_float

lua/tiny-inline-diagnostic/chunk.lua

@@ -70,13 +70,7 @@ function M.get_header_from_chunk(
   vim.list_extend(virt_texts, { { icon, diag_hi } })
 
   local cursor_line = vim.api.nvim_win_get_cursor(0)[1] - 1
-  local add_messages_opts = type(opts.options.add_messages) == "table" and opts.options.add_messages
-    or {
-      messages = opts.options.add_messages,
-      display_count = false,
-      use_max_severity = false,
-      show_multiple_glyphs = true,
-    }
+  local add_messages_opts = opts.options.add_messages
 
   local add_messages = add_messages_opts.messages
   local display_count = add_messages_opts.display_count
@@ -130,13 +124,7 @@ function M.add_severity_icons(virt_texts, opts, severities, diag_hi)
     return
   end
 
-  local add_messages_opts = type(opts.options.add_messages) == "table" and opts.options.add_messages
-    or {
-      messages = opts.options.add_messages,
-      display_count = false,
-      use_max_severity = false,
-      show_multiple_glyphs = true,
-    }
+  local add_messages_opts = opts.options.add_messages
 
   local show_multiple_glyphs = add_messages_opts.show_multiple_glyphs
   local use_max_severity = add_messages_opts.use_max_severity
@@ -217,7 +205,9 @@ function M.get_diagnostic_icon(opts, severities, index_diag, total_chunks)
 
   if opts.options.use_icons_from_diagnostic then
     if total_chunks == 1 then
-      icon = highlights.get_diagnostic_icon(severities[#severities])
+      local sorted = vim.deepcopy(severities)
+      table.sort(sorted)
+      icon = highlights.get_diagnostic_icon(sorted[1])
     else
       icon = highlights.get_diagnostic_icon(severities[index_diag])
     end
@@ -393,22 +383,18 @@ function M.get_chunks(opts, diags_on_line, diag_index, diag_line, cursor_line, b
   local diag = diags_on_line[diag_index]
 
   local show_source = false
-  if type(opts.options.show_source) == "table" then
-    if opts.options.show_source.enabled then
-      if opts.options.show_source.if_many then
-        local sources = {}
-        for _, d in ipairs(diags_on_line) do
-          if d.source then
-            sources[d.source] = true
-          end
+  if opts.options.show_source.enabled then
+    if opts.options.show_source.if_many then
+      local sources = {}
+      for _, d in ipairs(diags_on_line) do
+        if d.source then
+          sources[d.source] = true
         end
-        show_source = vim.tbl_count(sources) > 1
-      else
-        show_source = true
       end
+      show_source = vim.tbl_count(sources) > 1
+    else
+      show_source = true
     end
-  elseif opts.options.show_source then
-    show_source = true
   end
 
   local show_code = opts.options.show_code
@@ -444,9 +430,7 @@ function M.get_chunks(opts, diags_on_line, diag_index, diag_line, cursor_line, b
 
   local other_extmarks_offset = extmarks.handle_other_extmarks(buf, diag_line, line_length)
 
-  local multilines_enabled = type(opts.options.multilines) == "table"
-      and opts.options.multilines.enabled
-    or opts.options.multilines
+  local multilines_enabled = opts.options.multilines.enabled
 
   if
     (opts.options.overflow.mode ~= "none" and not multilines_enabled) or cursor_line == diag_line

lua/tiny-inline-diagnostic/filter.lua

@@ -90,12 +90,12 @@ end
 ---@param diagnostics table
 ---@return table
 local function add_related_diagnostics(opts, diagnostics)
-  if not opts.options.show_related or not opts.options.show_related.enabled then
+  if not opts.options.show_related.enabled then
     return diagnostics
   end
 
   local result = {}
-  local max_count = opts.options.show_related.max_count or 3
+  local max_count = opts.options.show_related.max_count
 
   for _, diag in ipairs(diagnostics) do
     table.insert(result, diag)

lua/tiny-inline-diagnostic/init.lua

@@ -110,18 +110,40 @@ local function normalize_config(config)
   if type(config.options.multilines) == "boolean" then
     config.options.multilines = vim.tbl_deep_extend("force", default_config.options.multilines, {
       enabled = config.options.multilines,
-      always_show = default_config.options.multilines.always_show,
     })
+  elseif type(config.options.multilines) == "table" then
+    config.options.multilines =
+      vim.tbl_deep_extend("force", default_config.options.multilines, config.options.multilines)
   end
 
   if type(config.options.add_messages) == "boolean" then
     config.options.add_messages =
       vim.tbl_deep_extend("force", default_config.options.add_messages, {
         messages = config.options.add_messages,
-        display_count = default_config.options.add_messages.display_count,
-        use_max_severity = default_config.options.add_messages.use_max_severity,
-        show_multiple_glyphs = default_config.options.add_messages.show_multiple_glyphs,
       })
+  elseif type(config.options.add_messages) == "table" then
+    config.options.add_messages =
+      vim.tbl_deep_extend("force", default_config.options.add_messages, config.options.add_messages)
+  end
+
+  if type(config.options.show_source) == "boolean" then
+    config.options.show_source =
+      vim.tbl_deep_extend("force", default_config.options.show_source, {
+        enabled = config.options.show_source,
+      })
+  elseif type(config.options.show_source) == "table" then
+    config.options.show_source =
+      vim.tbl_deep_extend("force", default_config.options.show_source, config.options.show_source)
+  end
+
+  if type(config.options.show_related) == "boolean" then
+    config.options.show_related =
+      vim.tbl_deep_extend("force", default_config.options.show_related, {
+        enabled = config.options.show_related,
+      })
+  elseif type(config.options.show_related) == "table" then
+    config.options.show_related =
+      vim.tbl_deep_extend("force", default_config.options.show_related, config.options.show_related)
   end
 
   return config
@@ -146,6 +168,11 @@ function M.setup(opts)
   if config.options.experimental.use_window_local_extmarks then
     extmarks.update_namespace_window()
   end
+
+  if config.options.override_open_float then
+    local override = require("tiny-inline-diagnostic.override")
+    vim.diagnostic.open_float = override.open_float
+  end
 end
 
 --- Change the blend and highlight settings dynamically.