Merge branch 'main' into search2

2023-11-17 13:22:30 +01:00
parent 8845f5a183 9d8184670a
commit dca2dc7b6b
88 changed files with 2879 additions and 1796 deletions
@@ -797,7 +797,7 @@ impl Item for Editor {

    fn added_to_workspace(&mut self, workspace: &mut Workspace, cx: &mut ViewContext<Self>) {
        let workspace_id = workspace.database_id();
-        let item_id = cx.view().entity_id().as_u64() as ItemId;
+        let item_id = cx.view().item_id().as_u64() as ItemId;
        self.workspace = Some((workspace.weak_handle(), workspace.database_id()));

        fn serialize(
@@ -828,7 +828,7 @@ impl Item for Editor {
                        serialize(
                            buffer,
                            *workspace_id,
-                            cx.view().entity_id().as_u64() as ItemId,
+                            cx.view().item_id().as_u64() as ItemId,
                            cx,
                        );
                    }