feat: validate user config for hide adapters

Author: igorlfs

lua/dap-view/actions.lua

@@ -55,7 +55,7 @@ M.open = function()
 
     local config = setup.config
 
-    local is_term_win_valid = term_winnr ~= nil and api.nvim_win_is_valid(term_winnr) or false
+    local is_term_win_valid = term_winnr ~= nil and api.nvim_win_is_valid(term_winnr)
 
     local winnr = api.nvim_open_win(bufnr, false, {
         split = is_term_win_valid and "right" or "below",

lua/dap-view/config.lua

@@ -6,18 +6,18 @@ local M = {}
 ---@field default_section SectionType
 ---@field show boolean
 
+---@class TerminalConfig
+---@field hide string[] Hide the terminal for listed adapters.
+
 ---@class WindowsConfig
 ---@field height integer
-
----@class TerminalConfig
----@field exclude_adapters string[] Disable the terminal view for selected adapters.
+---@field terminal TerminalConfig
 
 ---@alias SectionType '"breakpoints"' | '"exceptions"' | '"watches"' | '"repl"'
 
 ---@class Config
 ---@field winbar WinbarConfig
 ---@field windows WindowsConfig
----@field terminal TerminalConfig
 M.config = {
     winbar = {
         show = true,
@@ -26,9 +26,9 @@ M.config = {
     },
     windows = {
         height = 12,
-    },
-    terminal = {
-        exclude_adapters = {},
+        terminal = {
+            hide = {},
+        },
     },
 }
 

lua/dap-view/events.lua

@@ -19,7 +19,7 @@ dap.listeners.before.initialize[SUBSCRIPTION_ID] = function(session, _)
     -- (B) Uses the terminal, after a session that doesn't
     -- The terminal wouldn't show up, since it's hidden
     --
-    -- To handle scenarios, we have to close the terminal buffer
+    -- To handle these scenarios, we have to close the terminal buffer
     -- However, if we always close the terminal, dap-view will be shifted very quickly (if open),
     -- causing a flickering effect.
     --
@@ -28,6 +28,7 @@ dap.listeners.before.initialize[SUBSCRIPTION_ID] = function(session, _)
     if state.last_active_adapter ~= session.config.type then
         term.clear_term_bufnr()
     end
+    state.last_active_adapter = session.config.type
 
     term.open_term_buf_win()
 end

lua/dap-view/setup/validate/windows.lua

@@ -1,10 +1,17 @@
 local M = {}
 
+local validate = require("dap-view.setup.validate.util").validate
+
 ---@param config WindowsConfig
 function M.validate(config)
-    require("dap-view.setup.validate.util").validate("windows", {
+    validate("windows", {
         height = { config.height, "number" },
+        terminal = { config.terminal, "table" },
     }, config)
+
+    validate("windows.terminal", {
+        hide = { config.terminal.hide, "table" },
+    }, config.terminal)
 end
 
 return M

lua/dap-view/term/init.lua

@@ -36,9 +36,9 @@ end
 M.open_term_buf_win = function()
     -- When (re)opening the terminal we should NOT close it,
     -- since it's the default standard output for most adapters
-    -- Therefore, closing it could delete useful information from past sessions
+    -- Therefore, closing it could delete useful information from the last session
 
-    if term_bufnr == nil then
+    if not term_bufnr then
         term_bufnr = api.nvim_create_buf(true, false)
 
         assert(term_bufnr ~= 0, "Failed to create nvim-dap-view buffer")
@@ -48,19 +48,15 @@ M.open_term_buf_win = function()
 
     local config = setup.config
 
-    if term_winnr == nil then
-        for _, adapter in ipairs(config.terminal.exclude_adapters) do
-            dap.defaults[adapter].terminal_win_cmd = function(session)
-                state.last_active_adapter = session.type
-
+    if not term_winnr then
+        for _, adapter in ipairs(config.windows.terminal.hide) do
+            dap.defaults[adapter].terminal_win_cmd = function()
                 return term_bufnr
             end
         end
 
-        dap.defaults.fallback.terminal_win_cmd = function(session)
-            state.last_active_adapter = session.type
-
-            local is_win_valid = state.winnr ~= nil and api.nvim_win_is_valid(state.winnr) or false
+        dap.defaults.fallback.terminal_win_cmd = function()
+            local is_win_valid = state.winnr ~= nil and api.nvim_win_is_valid(state.winnr)
             term_winnr = api.nvim_open_win(term_bufnr, false, {
                 split = is_win_valid and "left" or "below",
                 win = is_win_valid and state.winnr or -1,