refactor(*): cleanup

Author: igorlfs

lua/dap-view/actions.lua

@@ -8,10 +8,10 @@ local state = require("dap-view.state")
 local settings = require("dap-view.options.settings")
 local globals = require("dap-view.globals")
 
-local api = vim.api
-
 local M = {}
 
+local api = vim.api
+
 ---@param hide_terminal? boolean
 M.toggle = function(hide_terminal)
     if state.bufnr then
@@ -81,9 +81,9 @@ M.open = function()
 end
 
 M.add_expr = function()
-    require("dap-view.watches.actions").add_watch_expr(vim.fn.expand("<cexpr>"))
-
-    require("dap-view.views").switch(require("dap-view.watches.view").show)
+    if require("dap-view.watches.actions").add_watch_expr(vim.fn.expand("<cexpr>")) then
+        require("dap-view.views").switch_to_view(require("dap-view.watches.view").show)
+    end
 end
 
 return M

lua/dap-view/exceptions/view.lua

@@ -16,27 +16,26 @@ M.show = function()
         -- Clear previous content
         api.nvim_buf_set_lines(state.bufnr, 0, -1, true, {})
 
-        if
-            views.cleanup_view(not dap.session(), "No active session")
-            or views.cleanup_view(not state.exceptions_options, "Not supported by debug adapter")
-        then
+        if views.cleanup_view(not dap.session(), "No active session") then
             return
         end
 
-        if state.exceptions_options then
-            local content = vim.iter(state.exceptions_options)
-                :map(function(opt)
-                    local icon = opt.enabled and "" or ""
-                    return "  " .. icon .. "  " .. opt.exception_filter.label
-                end)
-                :totable()
+        if views.cleanup_view(not state.exceptions_options, "Not supported by debug adapter") then
+            return
+        end
+
+        local content = vim.iter(state.exceptions_options or {})
+            :map(function(opt)
+                local icon = opt.enabled and "" or ""
+                return "  " .. icon .. "  " .. opt.exception_filter.label
+            end)
+            :totable()
 
-            api.nvim_buf_set_lines(state.bufnr, 0, -1, false, content)
+        api.nvim_buf_set_lines(state.bufnr, 0, -1, false, content)
 
-            for i, opt in ipairs(state.exceptions_options) do
-                local hl_type = opt.enabled and "Enabled" or "Disabled"
-                hl.hl_range("ExceptionFilter" .. hl_type, { i - 1, 0 }, { i - 1, 4 })
-            end
+        for i, opt in ipairs(state.exceptions_options) do
+            local hl_type = opt.enabled and "Enabled" or "Disabled"
+            hl.hl_range("ExceptionFilter" .. hl_type, { i - 1, 0 }, { i - 1, 4 })
         end
     end
 end

lua/dap-view/options/settings.lua

@@ -61,7 +61,7 @@ M.set_keymaps = function()
             local current_expr = state.watched_expressions[line]
 
             vim.ui.input({ prompt = "Expression: ", default = current_expr }, function(input)
-                if input and watches_actions.is_expr_valid(input) then
+                if input then
                     watches_actions.edit_watch_expr(input, line)
                 end
             end)

lua/dap-view/options/winbar.lua

@@ -9,7 +9,7 @@ local winbar_info = {
         keymap = "B",
         action = function()
             if vim.tbl_contains(setup.config.winbar.sections, "breakpoints") then
-                require("dap-view.views").switch(require("dap-view.breakpoints.view").show)
+                require("dap-view.views").switch_to_view(require("dap-view.breakpoints.view").show)
             end
         end,
     },
@@ -18,7 +18,7 @@ local winbar_info = {
         keymap = "E",
         action = function()
             if vim.tbl_contains(setup.config.winbar.sections, "exceptions") then
-                require("dap-view.views").switch(require("dap-view.exceptions.view").show)
+                require("dap-view.views").switch_to_view(require("dap-view.exceptions.view").show)
             end
         end,
     },
@@ -27,7 +27,7 @@ local winbar_info = {
         keymap = "W",
         action = function()
             if vim.tbl_contains(setup.config.winbar.sections, "watches") then
-                require("dap-view.views").switch(require("dap-view.watches.view").show)
+                require("dap-view.views").switch_to_view(require("dap-view.watches.view").show)
             end
         end,
     },
@@ -36,7 +36,7 @@ local winbar_info = {
         keymap = "T",
         action = function()
             if vim.tbl_contains(setup.config.winbar.sections, "threads") then
-                require("dap-view.views").switch(require("dap-view.threads.view").show)
+                require("dap-view.views").switch_to_view(require("dap-view.threads.view").show)
             end
         end,
     },

lua/dap-view/state.lua

@@ -2,6 +2,9 @@
 ---@field exception_filter dap.ExceptionBreakpointsFilter
 ---@field enabled boolean
 
+---@class ThreadWithErr: dap.Thread
+---@field err? string
+
 ---@class State
 ---@field bufnr? integer
 ---@field winnr? integer
@@ -11,7 +14,7 @@
 ---@field last_active_adapter? string
 ---@field current_section? SectionType
 ---@field exceptions_options? ExceptionsOption[]
----@field threads dap.Thread[]
+---@field threads ThreadWithErr[]
 ---@field threads_err? string
 ---@field frames_by_line {[number]: dap.StackFrame[]}
 ---@field subtle_frames boolean

lua/dap-view/threads/init.lua

@@ -10,34 +10,31 @@ M.get_threads = function()
     coroutine.wrap(function()
         local err, result = session:request("threads", {})
 
-        if err then
-            state.threads_err = tostring(err)
-            return
-        end
-
         state.threads_err = nil
 
-        if result then
+        if err then
+            state.threads_err = tostring(err)
+            state.threads = {}
+        elseif result then
             state.threads = result.threads
         end
 
-        M.get_stack_frames()
+        M.get_stack_frames(session)
     end)()
 end
 
-M.get_stack_frames = function()
-    local session = assert(dap.session(), "has active session")
-
+---@param session dap.Session
+M.get_stack_frames = function(session)
     for _, thread in pairs(state.threads) do
         coroutine.wrap(function()
             local err, result = session:request("stackTrace", { threadId = thread.id })
 
-            if err then
-                -- TODO
-                return
-            end
+            thread.err = nil
 
-            if result then
+            if err then
+                thread.err = tostring(err)
+                thread.frames = {}
+            elseif result then
                 thread.frames = result.stackFrames
             end
         end)()

lua/dap-view/threads/view.lua

@@ -48,6 +48,10 @@ M.show = function()
                 :totable()
 
             if vim.tbl_isempty(valid_frames) then
+                if thread.err then
+                    api.nvim_buf_set_lines(state.bufnr, line - 1, line, true, { thread.err })
+                    line = line + 1
+                end
                 line = line + 1
             else
                 local content = vim.iter(valid_frames):fold(

lua/dap-view/views/init.lua

@@ -21,21 +21,19 @@ M.cleanup_view = function(cond, message)
     return cond
 end
 
-local switch_to_dapview_buf = function()
-    if not (state.winnr and api.nvim_win_is_valid(state.winnr)) then
+---@param callback fun(): nil
+M.switch_to_view = function(callback)
+    if not state.bufnr or not state.winnr or not api.nvim_win_is_valid(state.winnr) then
         return
     end
-    -- The REPL is actually another buffer
+
+    -- Update buffer if on REPL
     if state.current_section == "repl" then
         api.nvim_win_call(state.winnr, function()
             api.nvim_set_current_buf(state.bufnr)
         end)
     end
-end
 
----@param callback fun(): nil
-M.switch = function(callback)
-    switch_to_dapview_buf()
     callback()
 end
 

lua/dap-view/watches/actions.lua

@@ -5,26 +5,25 @@ local eval = require("dap-view.watches.eval")
 local M = {}
 
 ---@param expr string
-M.is_expr_valid = function(expr)
+local is_expr_valid = function(expr)
     -- Avoid duplicate expressions
     return #expr > 0 and not vim.tbl_contains(state.watched_expressions, expr)
 end
 
 ---@param expr string
+---@return boolean
 M.add_watch_expr = function(expr)
-    if not M.is_expr_valid(expr) then
-        return
-    end
-
-    if not guard.expect_session() then
-        return
+    if not is_expr_valid(expr) or not guard.expect_session() then
+        return false
     end
 
     eval.eval_expr(expr, function(result)
         table.insert(state.expression_results, result)
     end)
 
     table.insert(state.watched_expressions, expr)
+
+    return true
 end
 
 ---@param line number
@@ -36,7 +35,7 @@ end
 ---@param expr string
 ---@param line number
 M.edit_watch_expr = function(expr, line)
-    if not guard.expect_session() then
+    if not is_expr_valid(expr) or not guard.expect_session() then
         return
     end
 

lua/dap-view/watches/eval.lua

@@ -16,20 +16,18 @@ M.eval_expr = function(expr, callback)
         -- TODO currently, we only check for variables reference for the top level expression
         -- It would be nice to expose functionality to let the user control the depth
         -- This could be a config parameter (eg, base depth) but could also extend with an action (BFS)
-        local var_ref = result and result.variablesReference
-        if var_ref and var_ref > 0 then
+        local variables_reference = result and result.variablesReference
+        if variables_reference and variables_reference > 0 then
             local enhanced_expr_result = { expr_result }
 
             local var_ref_err, var_ref_result = session:request(
                 "variables",
-                { variablesReference = var_ref, context = "watch", frameId = frame_id }
+                { variablesReference = variables_reference, context = "watch", frameId = frame_id }
             )
 
             if var_ref_err then
                 table.insert(enhanced_expr_result, tostring(err))
-            end
-
-            if var_ref_result and not var_ref_err then
+            elseif var_ref_result then
                 for _, k in pairs(var_ref_result.variables) do
                     table.insert(enhanced_expr_result, "\t" .. k.name .. " = " .. k.value)
                 end