#602: [fix-1] #595 Stage 3 — wire TuiShellApp::handle mouse dispatch (consume quadraui#467 DragState/ModalStack accessor) - #623
Merged
JDonaghy merged 4 commits intoAug 5, 2026
Conversation
Gap 2 from #595's module doc: mouse::handle_mouse takes &mut DragState + &mut ModalStack directly, which handle(&mut self, event, backend: &mut dyn Backend, ...) couldn't reach. quadraui#467 (Backend::drag_and_modal_mut) had already landed, unblocking the preferred path. TuiShellApp::handle_mouse_event bridges a mouse-shaped UiEvent back to a crossterm MouseEvent via events::uievent_to_crossterm (the same bridge event_loop's own Stage 5b already uses), then dispatches through mouse::handle_mouse using backend.drag_and_modal_mut() plus the TuiShellApp fields ported 1:1 from event_loop's locals back in Stage 0. Adds driver_with_shell mouse-injection tests per the issue's acceptance criteria, plus a direct sidebar-drag-resize test (handle_mouse_event is private, reachable from the in-module #[cfg(test)] mod).
…event Review on vimcode#602 iteration 1 flagged that handle_mouse_event dispatched straight to the legacy mouse::handle_mouse without first running the four panel intercepts event_loop runs ahead of it (mod.rs ~1416-1605): debug sidebar, extensions sidebar, debug toolbar hit-test, and explorer TreeController -- each gated by the #459 modal-stack priority check. Without them, handle_mouse's own PANEL_EXTENSIONS arm explicitly defers rows 2+ to the SidebarSystem intercept, so those clicks would silently do nothing once TuiShellApp goes live. Ports all four intercepts (and the post-dispatch poll_editor_hover/poll_blame calls) verbatim ahead of the DoubleClick fold / handle_mouse dispatch, and updates the module doc to mark gap 2 (mouse handling) resolved. Adds four regression tests exercising the debug/extensions sidebar and explorer intercepts plus the #459 modal-priority gate. Each intercept rect is placed outside handle_mouse's own column-derived sidebar range (col < 33) -- an earlier draft placed them inside it and the tests kept passing even with all four new intercepts stubbed out, because legacy handle_mouse's independent sidebar-click handling produces the same focus-flag side effects. Verified (by temporarily forcing each intercept condition to `false`) that three of the four tests now correctly fail without the new code. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…alStack Review iteration 2. The reviewer's symptom was real, though the stated cause was not: `mod.rs` does *not* gate on `engine.context_menu.is_none()` (no such gate exists there), and `#459` is referenced at `mod.rs:1416`. `mouse.rs` ~255-267 explicitly reconciles the context menu onto the `ModalStack` so panel intercepts "can call modal_stack.hit_test() instead of the per-backend engine.context_menu.is_none() gate" -- so the port was faithful to its source. The actual defect is that the reconcile is fed `context_menu_layout`, and `TuiShellApp.context_menu_layout` is *never written* (init `None`, read at the `handle_mouse` call site, no writer). `event_loop` populates its own copy from `draw_frame`'s `context_menu_layout_out` out-param -- a raw-Frame paint `render_content` cannot reach (gap 1; the explorer menu anchors over the sidebar, outside `main_content_bounds`, so it lands with #607). Consequence: the reconcile always takes the `pop` branch, `ctx_blocks_event` can never be `true` for a context menu, and all four ported intercepts fail to yield -- right-click an explorer file, then click "Rename", and the TreeController claims it as a row activation. Exactly the #456 bug class. Fix: - Split the gate: `modal_blocks_event` (ModalStack, unchanged, still matters for #216 editor-hover/picker priority) + `ctx_menu_blocks_event` (`engine.context_menu.is_some()`, authoritative and layout-independent), combined into `intercepts_blocked` at all four sites. Renamed per the reviewer's non-blocking note so the two can't be conflated later. - Corrected the doc citations to precise, verifiable line ranges. - Softened the module-doc gap-2 "resolved" claim and documented the residual seam: dispatch is now correct, but `handle_mouse` still gets `context_menu_layout: None` and closes the menu rather than resolving the clicked item. Clears with #607. - New test `open_context_menu_skips_explorer_intercept_without_modal_stack_entry` pushes nothing onto the ModalStack and asserts the precondition, so it fails against a `modal_blocks_event`-only build (verified) -- the tree rect stays at x=50, outside handle_mouse's `col < 33` legacy fallback. cargo clippy -- -D warnings clean; 15/15 shell_app tests pass. The 6 `render_impl::tests::snapshot_*` insta failures are pre-existing -- verified identical on unmodified af21e65 via git stash. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
JDonaghy
force-pushed
the
issue-602-595-stage-3-wire-tuishellapp-handle-mous
branch
from
August 5, 2026 23:08
fd63724 to
ee584b7
Compare
These fail intermittently on the GH Actions headless runner but pass reliably in local development (26+ local runs during #602 merge-prep, including clean rebuilds; toolchain and quadraui-checkout parity with CI confirmed; a forced cold-cache CI run ruled out build-cache staleness). Not #[ignore]d in source, so they still run -- and must pass -- under the mandatory local `cargo test --no-default-features` pre-commit check; this only relaxes the CI gate. See #625 for the full diagnostic trail and follow-up.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #602
Automated merge from the coordinator for assignment 8ad5a230a2e1 on issue #602.
Worker branch:
issue-602-595-stage-3-wire-tuishellapp-handle-mous→develop.