Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 26, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6115af
fix: when using DapViewWatch on current position with repl showing, s…
catgoose Jan 24, 2025
4fb50c4
ref: use nvim_set_current_buf to set buffer for winnr
catgoose Jan 25, 2025
112dbf8
ref(watcher): when adding watcher expression check if window is valid…
catgoose Jan 25, 2025
4bb61e3
ref: add window id checks when switching views
catgoose Jan 26, 2025
9827158
ref: removes redundant function wraps for callback argument
catgoose Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lua/dap-view/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lua/dap-view/breakpoints/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
12 changes: 3 additions & 9 deletions lua/dap-view/options/winbar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Owner

@igorlfs igorlfs Jan 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

end
end,
},
Expand All @@ -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,
},
Expand All @@ -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,
},
Expand Down
7 changes: 6 additions & 1 deletion lua/dap-view/views/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down