fix(DapViewWatch): switch to Watcher view when repl active (#8)

* fix: when using DapViewWatch on current position with repl showing, switch to Watcher view

* ref: use nvim_set_current_buf to set buffer for winnr

* ref(watcher): when adding watcher expression check if window is valid before switching view

* ref: add window id checks when switching views

* ref: removes redundant function wraps for callback argument

Author: catgoose

lua/dap-view/actions.lua

@@ -82,10 +82,9 @@ end
 
 M.add_expr = function()
     local expression = expr.eval_expression()
-
     require("dap-view.watches.actions").add_watch_expr(expression)
 
-    require("dap-view.watches.view").show()
+    require("dap-view.views").switch(require("dap-view.watches.view").show)
 end
 
 return M

lua/dap-view/breakpoints/actions.lua

@@ -58,7 +58,7 @@ M._jump_to_breakpoint = function()
         if bufnr == -1 then
             vim.cmd("buffer " .. abs_path)
         else
-            vim.cmd("buffer " .. bufnr)
+            api.nvim_set_current_buf(bufnr)
         end
     end)
 

lua/dap-view/options/winbar.lua

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

lua/dap-view/views/init.lua

@@ -27,9 +27,14 @@ M.cleanup_view = function(cond, message)
 end
 
 local switch_to_dapview_buf = function()
+    if not (state.winnr and api.nvim_win_is_valid(state.winnr)) then
+        return
+    end
     -- The REPL is actually another buffer
     if state.current_section == "repl" then
-        vim.cmd("buffer " .. state.bufnr)
+        api.nvim_win_call(state.winnr, function()
+            api.nvim_set_current_buf(state.bufnr)
+        end)
     end
 end