Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix: skip root to get the right path

appflowyd386698e978f
diff --git a/shared-lib/lib-ot/src/core/document/document.rs b/shared-lib/lib-ot/src/core/document/document.rs
index a20457a656..ee7cb7111b 100644
--- a/shared-lib/lib-ot/src/core/document/document.rs
+++ b/shared-lib/lib-ot/src/core/document/document.rs
@@ -23,6 +23,21 @@ impl DocumentTree {
DocumentTree { arena, root }
}
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use lib_ot::core::{DocumentOperation, DocumentTree, NodeSubTree, Path};
+ /// let nodes = vec![NodeSubTree::new("text")];
+ /// let root_path: Path = vec![0].into();
+ /// let op = DocumentOperation::Insert {path: root_path.clone(),nodes };
+ ///
+ /// let mut document = DocumentTree::new();
+ /// document.apply_op(&op).unwrap();
+ /// let node_id = document.node_at_path(&root_path).unwrap();
+ /// let node_path = document.path_of_node(node_id);
+ /// debug_assert_eq!(node_path, root_path);
+ /// ```
pub fn node_at_path<T: Into<Path>>(&self, path: T) -> Option<NodeId> {
let path = path.into();
if path.is_empty() {
@@ -36,30 +51,9 @@ impl DocumentTree {
Some(iterate_node)
}
- ///
- ///
- /// # Arguments
- ///
- /// * `node_id`:
- ///
- /// returns: Path
- ///
- /// # Examples
- ///
- /// ```
- /// use lib_ot::core::{DocumentOperation, DocumentTree, NodeSubTree, Path};
- /// let text_node = NodeSubTree::new("text");
- /// let path: Path = vec![0].into();
- /// let op = DocumentOperation::Insert {path: path.clone(),nodes: vec![text_node
- /// ]};
- /// let mut document = DocumentTree::new();
- /// document.apply_op(&op).unwrap();
- /// let node_id = document.node_at_path(&path).unwrap();
- ///
- /// ```
pub fn path_of_node(&self, node_id: NodeId) -> Path {
let mut path: Vec<usize> = Vec::new();
- let mut ancestors = node_id.ancestors(&self.arena);
+ let mut ancestors = node_id.ancestors(&self.arena).skip(1);
let mut current_node = node_id;
let mut parent = ancestors.next();
@@ -76,10 +70,8 @@ impl DocumentTree {
fn index_of_node(&self, parent_node: NodeId, child_node: NodeId) -> usize {
let mut counter: usize = 0;
-
let mut children_iterator = parent_node.children(&self.arena);
let mut node = children_iterator.next();
-
while node.is_some() {
if node.unwrap() == child_node {
return counter;
diff --git a/shared-lib/lib-ot/src/core/document/position.rs b/shared-lib/lib-ot/src/core/document/position.rs
index e45c2556d6..383581db27 100644
--- a/shared-lib/lib-ot/src/core/document/position.rs
+++ b/shared-lib/lib-ot/src/core/document/position.rs
@@ -1,4 +1,6 @@
-#[derive(Clone, serde::Serialize, serde::Deserialize)]
+use serde::{Serialize, Deserialize};
+
+#[derive(Clone, Serialize, Deserialize, Eq, PartialEq, Debug)]
pub struct Path(pub Vec<usize>);
impl std::ops::Deref for Path {