fix(test): update helpers for config normalization changes

Author: rachartier

lua/tiny-inline-diagnostic/diagnostic.lua

@@ -121,7 +121,12 @@ end
 function M.get_diagnostic_under_cursor()
   local buf = vim.api.nvim_get_current_buf()
   local diagnostics = vim.diagnostic.get(buf)
-  return M.filter_diags_under_cursor({ options = {} }, buf, diagnostics)
+  local minimal_opts = {
+    options = {
+      show_related = { enabled = true, max_count = 3 },
+    },
+  }
+  return M.filter_diags_under_cursor(minimal_opts, buf, diagnostics)
 end
 
 return M

lua/tiny-inline-diagnostic/filter.lua

@@ -90,7 +90,7 @@ end
 ---@param diagnostics table
 ---@return table
 local function add_related_diagnostics(opts, diagnostics)
-  if not opts.options.show_related.enabled then
+  if not opts.options.show_related or not opts.options.show_related.enabled then
     return diagnostics
   end
 

lua/tiny-inline-diagnostic/init.lua

@@ -93,6 +93,21 @@ local function setup_colorscheme_handler(config)
   })
 end
 
+---Normalize a single option field that can be boolean or table
+---@param value any User-provided value
+---@param default_value table Default table value
+---@param boolean_key string Key to set when value is boolean (e.g., "enabled" or "messages")
+---@return table Normalized table value
+local function normalize_option(value, default_value, boolean_key)
+  if type(value) == "boolean" then
+    return vim.tbl_deep_extend("force", default_value, { [boolean_key] = value })
+  elseif type(value) == "table" then
+    return vim.tbl_deep_extend("force", default_value, value)
+  else
+    return vim.deepcopy(default_value)
+  end
+end
+
 ---Normalize configuration values
 local function normalize_config(config)
   if config.options.overflow and config.options.overflow.mode then
@@ -107,44 +122,29 @@ local function normalize_config(config)
     config = vim.tbl_deep_extend("force", config, preset)
   end
 
-  if type(config.options.multilines) == "boolean" then
-    config.options.multilines = vim.tbl_deep_extend("force", default_config.options.multilines, {
-      enabled = config.options.multilines,
-    })
-  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,
-      })
-  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
+  config.options.multilines = normalize_option(
+    config.options.multilines,
+    default_config.options.multilines,
+    "enabled"
+  )
+
+  config.options.add_messages = normalize_option(
+    config.options.add_messages,
+    default_config.options.add_messages,
+    "messages"
+  )
+
+  config.options.show_source = normalize_option(
+    config.options.show_source,
+    default_config.options.show_source,
+    "enabled"
+  )
+
+  config.options.show_related = normalize_option(
+    config.options.show_related,
+    default_config.options.show_related,
+    "enabled"
+  )
 
   return config
 end

tests/helpers.lua

@@ -88,6 +88,11 @@ function H.make_opts(overrides)
         enabled = false,
         if_many = false,
       },
+      show_code = true,
+      show_related = {
+        enabled = true,
+        max_count = 3,
+      },
       add_messages = {
         messages = true,
         display_count = false,
@@ -103,8 +108,10 @@ function H.make_opts(overrides)
         always_show = false,
         trim_whitespaces = false,
         tabstop = 4,
+        severity = nil,
       },
       show_all_diags_on_cursorline = false,
+      show_diags_only_under_cursor = false,
       enable_on_insert = false,
       enable_on_select = false,
       format = nil,
@@ -127,12 +134,34 @@ function H.make_opts(overrides)
       override_open_float = false,
       overwrite_events = nil,
       multiple_diag_under_cursor = false,
+      experimental = {
+        use_window_local_extmarks = false,
+      },
     },
     disabled_ft = {},
   }
+
+  local defaults = vim.deepcopy(base.options)
+
   if overrides then
     base = vim.tbl_deep_extend("force", base, overrides)
   end
+
+  local function normalize_option(value, default_value, boolean_key)
+    if type(value) == "boolean" then
+      return vim.tbl_deep_extend("force", default_value, { [boolean_key] = value })
+    elseif type(value) == "table" then
+      return vim.tbl_deep_extend("force", default_value, value)
+    else
+      return vim.deepcopy(default_value)
+    end
+  end
+
+  base.options.multilines = normalize_option(base.options.multilines, defaults.multilines, "enabled")
+  base.options.add_messages = normalize_option(base.options.add_messages, defaults.add_messages, "messages")
+  base.options.show_source = normalize_option(base.options.show_source, defaults.show_source, "enabled")
+  base.options.show_related = normalize_option(base.options.show_related, defaults.show_related, "enabled")
+
   return base
 end