first pass of merging in warp (doesn't build)

app/src/integration_testing/notebook/assertion.rs

@@ -1,24 +1,19 @@
-use galaxy_editor::render::model::BlockItem;
-use galaxyui::{
-    async_assert, async_assert_eq,
-    integration::{AssertionCallback, AssertionOutcome, AssertionWithDataCallback},
-    App, ViewHandle,
-};
 use itertools::Itertools;
 use string_offset::CharOffset;
+use galaxy_editor::render::model::BlockItem;
+use galaxyui::integration::{AssertionCallback, AssertionOutcome, AssertionWithDataCallback};
+use galaxyui::{async_assert, async_assert_eq, App, ViewHandle};
 
-use crate::{
-    cloud_object::model::{generic_string_model::GenericStringObjectId, persistence::CloudModel},
-    integration_testing::{
-        cloud_object::assert_metadata_revision,
-        terminal::util::ExpectedOutput,
-        view_getters::{notebook_view, terminal_view},
-    },
-    notebooks::{notebook::NotebookView, CloudNotebookModel, NotebookId},
-    pane_group::PaneGroup,
-    server::ids::SyncId,
-    settings::{CloudPreferenceModel, Preference},
-};
+use crate::cloud_object::model::generic_string_model::GenericStringObjectId;
+use crate::cloud_object::model::persistence::CloudModel;
+use crate::integration_testing::cloud_object::assert_metadata_revision;
+use crate::integration_testing::terminal::util::ExpectedOutput;
+use crate::integration_testing::view_getters::{notebook_view, terminal_view};
+use crate::notebooks::notebook::NotebookView;
+use crate::notebooks::{CloudNotebookModel, NotebookId};
+use crate::pane_group::PaneGroup;
+use crate::server::ids::SyncId;
+use crate::settings::{CloudPreferenceModel, Preference};
 
 /// Asserts that the notebook in the given pane has the expected Markdown content.
 pub fn assert_notebook_contents(