fix(term): follow winnr if "console" is enabled

Also adds some minor tweaks

Author: igorlfs

lua/dap-view/term/scroll.lua

@@ -1,3 +1,4 @@
+local setup = require("dap-view.setup")
 local util = require("dap-view.util")
 local state = require("dap-view.state")
 
@@ -22,17 +23,21 @@ M.scroll = function(bufnr)
         end,
     })
 
+    local winnr = vim.tbl_contains(setup.config.winbar.sections, "console") and state.winnr or state.term_winnr
+
     api.nvim_buf_attach(bufnr, false, {
         on_lines = function()
-            if not util.is_win_valid(state.term_winnr) then
+            if not util.is_win_valid(winnr) then
                 return
             end
+            ---@cast winnr integer
             if autoscroll and vim.fn.mode() == "n" then
-                api.nvim_win_call(state.term_winnr, function()
+                api.nvim_win_call(winnr, function()
                     if api.nvim_get_current_buf() == bufnr then
-                        -- vim.schedule ensures the cursor movement happens in the main event loop.
+                        -- vim.schedule ensures the cursor movement happens in the main event loop
+                        -- otherwise the call may happen too early
                         vim.schedule(function()
-                            api.nvim_win_set_cursor(state.term_winnr, { api.nvim_buf_line_count(bufnr), 0 })
+                            api.nvim_win_set_cursor(winnr, { api.nvim_buf_line_count(bufnr), 0 })
                         end)
                     end
                 end)

lua/dap-view/threads/init.lua

@@ -8,7 +8,7 @@ local api = vim.api
 M.track_cursor_position = function(current_frame_id)
     for k, v in pairs(state.frames_by_line) do
         if v.id == current_frame_id then
-            api.nvim_win_set_cursor(state.winnr, { k, 1 })
+            api.nvim_win_set_cursor(state.winnr, { k, 0 })
         end
     end
 end

lua/dap-view/views/init.lua

@@ -54,7 +54,7 @@ M.switch_to_view = function(view)
     local buf_len = api.nvim_buf_line_count(state.bufnr)
     state.cur_pos[view] = math.min(cursor_line, buf_len)
 
-    api.nvim_win_set_cursor(state.winnr, { state.cur_pos[view], 1 })
+    api.nvim_win_set_cursor(state.winnr, { state.cur_pos[view], 0 })
 end
 
 return M