fix(watches): improve cursor position restoration

Author: igorlfs

lua/dap-view/events.lua

@@ -2,7 +2,6 @@ local dap = require("dap")
 
 local state = require("dap-view.state")
 local breakpoints = require("dap-view.breakpoints.view")
-local watches = require("dap-view.watches.view")
 local scopes = require("dap-view.scopes.view")
 local threads = require("dap-view.threads.view")
 local exceptions = require("dap-view.exceptions.view")
@@ -68,7 +67,7 @@ end
 
 dap.listeners.after.variables[SUBSCRIPTION_ID] = function()
     if state.current_section == "watches" then
-        watches.show()
+        require("dap-view.views").switch_to_view("watches")
     end
 end
 

lua/dap-view/views/keymaps/init.lua

@@ -1,6 +1,5 @@
 local state = require("dap-view.state")
 local threads_view = require("dap-view.threads.view")
-local watches_view = require("dap-view.watches.view")
 local watches_actions = require("dap-view.watches.actions")
 local docs = require("dap-view.views.keymaps.docs")
 local keymap = require("dap-view.views.keymaps.util").keymap
@@ -48,7 +47,7 @@ M.set_keymaps = function()
 
             watches_actions.remove_watch_expr(cursor_line)
 
-            watches_view.show()
+            require("dap-view.views").switch_to_view("watches")
         elseif state.current_section == "breakpoints" then
             require("dap-view.breakpoints.actions").remove_breakpoint()
 

lua/dap-view/watches/actions.lua

@@ -3,7 +3,6 @@ local guard = require("dap-view.guard")
 local eval = require("dap-view.watches.eval")
 local set = require("dap-view.watches.set")
 local traversal = require("dap-view.tree.traversal")
-local watches_view = require("dap-view.watches.view")
 
 local M = {}
 
@@ -15,7 +14,7 @@ M.add_watch_expr = function(expr)
     end
 
     eval.eval_expr(expr, function()
-        watches_view.show()
+        require("dap-view.views").switch_to_view("watches")
     end)
 
     return true
@@ -118,7 +117,7 @@ M.edit_watch_expr = function(expr, line)
     M.remove_watch_expr(line)
 
     eval.eval_expr(expr, function()
-        watches_view.show()
+        require("dap-view.views").switch_to_view("watches")
     end)
 end
 
@@ -136,7 +135,7 @@ M.expand_or_collapse = function(line)
             e.expanded = not e.expanded
 
             eval.eval_expr(expr.name, function()
-                watches_view.show()
+                require("dap-view.views").switch_to_view("watches")
             end)
         end
     else
@@ -150,6 +149,8 @@ M.expand_or_collapse = function(line)
                     var_state.expanded = not var_state.expanded
                     eval.expand_var(reference, var_state.children, function(result)
                         var_state.children = result
+
+                        require("dap-view.views").switch_to_view("watches")
                     end)
                 end
             else

lua/dap-view/watches/eval.lua

@@ -1,4 +1,3 @@
-local watches = require("dap-view.watches.view")
 local state = require("dap-view.state")
 
 local M = {}
@@ -172,7 +171,7 @@ M.reeval = function()
     end
 
     if state.current_section == "watches" then
-        watches.show()
+        require("dap-view.views").switch_to_view("watches")
     end
 end
 

lua/dap-view/watches/view.lua

@@ -91,24 +91,21 @@ M.show = function()
         return
     end
 
-    if state.bufnr then
-        local cursor_line = api.nvim_win_get_cursor(state.winnr)[1]
-
-        -- TODO this SHOULD NOT be necessary
-        -- Refactor the `eval` code so I can have a callback with this function
-        -- that triggers only when I'm done evaluating the whole tree
-        views.cleanup_view(#state.watched_expressions == 0, "No expressions")
+    -- Since variables aren't ordered, lines may change unexpectedly
+    -- To handle that, always clear the storage table
+    for k, _ in pairs(state.expressions_by_line) do
+        state.expressions_by_line[k] = nil
+    end
+    -- Also clear variables for the same reason
+    for k, _ in pairs(state.variables_by_line) do
+        state.variables_by_line[k] = nil
+    end
 
-        -- Since variables aren't ordered, lines may change unexpectedly
-        -- To handle that, always clear the storage table
-        for k, _ in pairs(state.expressions_by_line) do
-            state.expressions_by_line[k] = nil
-        end
-        -- Also clear variables for the same reason
-        for k, _ in pairs(state.variables_by_line) do
-            state.variables_by_line[k] = nil
-        end
+    if views.cleanup_view(vim.tbl_isempty(state.watched_expressions), "No expressions") then
+        return
+    end
 
+    if state.bufnr then
         local line = 0
 
         for expr_name, expr in pairs(state.watched_expressions) do
@@ -142,18 +139,7 @@ M.show = function()
             line = show_variables_or_err(line, expr)
         end
 
-        -- Workaround to reduce jankiness when redrawing
-        if line > 0 then
-            local content = {}
-            if cursor_line > line then
-                for i = 1, cursor_line - line do
-                    content[i] = ""
-                end
-            end
-            api.nvim_buf_set_lines(state.bufnr, line, -1, true, content)
-
-            state.cur_pos["watches"] = api.nvim_win_set_cursor(state.winnr, { cursor_line, 1 })
-        end
+        api.nvim_buf_set_lines(state.bufnr, line, -1, true, {})
     end
 end