Integrate diagnostic decorations and current-source Text input boundaries

crates/oa-desktop/src/app/text_workspace.rs

@@ -399,6 +399,24 @@ impl App {
             ))
         })
     }
+    pub(crate) fn source_annotation_snapshot(
+        &self,
+    ) -> Option<crate::source_annotations::Snapshot<'_>> {
+        let publication = self.text_workspace.diagnostic_publication?;
+        let buffer = self
+            .source_workspace
+            .files
+            .get(&self.source_workspace.active)?;
+        if publication.source != self.source_key() || buffer.text != self.source_snapshot.as_ref() {
+            return None;
+        }
+        Some(crate::source_annotations::Snapshot {
+            publication: publication.generation,
+            source: self.source_snapshot.clone(),
+            path: &self.source_workspace.active,
+            diagnostics: &self.source_diagnostics,
+        })
+    }
     fn text_command_action(&self, command: Command) -> Option<Action> {
         // Menu has been taken before dispatch-time admission. This intentionally
         // uses navigation admission, not rename admission, for Find/text history.
@@ -468,6 +486,7 @@ impl App {
                 let Some(popup_token) = self.menu_sequence.checked_add(1) else {
                     return Task::none();
                 };
+                self.text_presentation_boundary(Event::OpenMenu(request.clone()));
                 self.source_interaction();
                 let commands = [
                     Command::Find,
@@ -513,6 +532,7 @@ impl App {
                     .as_ref()
                     .is_some_and(|menu| menu.token == token)
                 {
+                    self.text_presentation_boundary(Event::DismissMenu(token));
                     self.text_workspace.menu = None;
                     self.source_interaction();
                 }
@@ -551,12 +571,14 @@ impl App {
                 if context != self.text_drawer_context() || !self.source_navigation_available() {
                     return Task::none();
                 }
+                self.text_presentation_boundary(Event::ShowDrawer(context, tab));
                 return self.show_text_drawer(Some(tab));
             }
             Event::HideDrawer(context) => {
                 if context != self.text_drawer_context() || !self.source_navigation_available() {
                     return Task::none();
                 }
+                self.text_presentation_boundary(Event::HideDrawer(context));
                 return self.show_text_drawer(None);
             }
             Event::ResizeDrawer(context, height) => {
@@ -567,15 +589,22 @@ impl App {
                     // The view applies the measured editor-allocation bound.
                     let height = height.clamp(180., 1200.);
                     if height != self.text_workspace.drawer_height {
+                        self.text_presentation_boundary(Event::ResizeDrawer(context, height));
                         self.source_interaction();
                         self.text_workspace.drawer_height = height;
                     }
                 }
             }
             Event::ToggleFile { stamp, visit, path } => {
+                let captured = Event::ToggleFile {
+                    stamp,
+                    visit,
+                    path: path.clone(),
+                };
                 if self.source_navigation_available()
                     && self.text_workspace.toggle_file(stamp, visit, path)
                 {
+                    self.text_presentation_boundary(captured);
                     self.source_interaction();
                 }
             }
@@ -598,6 +627,7 @@ impl App {
                 {
                     return Task::none();
                 }
+                self.text_presentation_boundary(Event::Diagnostic(target.clone()));
                 self.source_interaction();
                 self.jump_to_source(target.location);
             }
@@ -607,9 +637,22 @@ impl App {
     fn dispatch_text_action(&mut self, action: Action) -> Task<Message> {
         match action {
             Action::Dispatch(message) => self.update(*message),
-            Action::Drawer(tab) => self.show_text_drawer(Some(tab)),
+            Action::Drawer(tab) => {
+                self.text_presentation_boundary(Event::ShowDrawer(self.text_drawer_context(), tab));
+                self.show_text_drawer(Some(tab))
+            }
         }
     }
+    /// Local Text presentation changes do not mutate a camera, document or route.
+    /// After their own authority check, they still supersede pending navigation
+    /// and allocation through the root's existing input boundary hooks. Source
+    /// commands use update instead; passive measurements never enter this hook.
+    fn text_presentation_boundary(&mut self, event: Event) {
+        let message = Message::TextWorkspace(event);
+        self.reconcile_pending_diagram_reveal(&message);
+        self.allocation_before(&message);
+    }
+
     pub(super) fn show_text_drawer(&mut self, drawer: Option<DrawerTab>) -> Task<Message> {
         self.source_interaction();
         self.text_workspace.show_drawer(drawer);