org_mode_samples/greater_element/property_drawer/headline/comment.org

@@ -1,5 +0,0 @@
-* baz
-# lorem
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/headline/comment_space.org

@@ -1,6 +0,0 @@
-* baz
-# lorem
-
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/headline/immediate.org

@@ -1,4 +0,0 @@
-* baz
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/headline/space.org

@@ -1,5 +0,0 @@
-* baz
-
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/headline/space_comment_space.org

@@ -1,13 +0,0 @@
-* baz
-
-
-
-
-# lorem
-
-
-
-
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/inheritance.org

@@ -1,19 +0,0 @@
-:PROPERTIES:
-:foo: bar
-:foo+: baz
-:cat: dog
-:END:
-
-# Even though these are inheriting the properties and overwriting and/or appending to them, this is not represented in the parser AST so Organic does not do any special handling of this.
-
-* Overwrite
-:PROPERTIES:
-:foo:      lorem
-:bat:      car
-:END:
-
-* Append
-:PROPERTIES:
-:foo+:      ipsum
-:cake:      lie
-:END:

org_mode_samples/greater_element/property_drawer/zeroth_section.org

@@ -0,0 +1,25 @@
+
+
+
+
+# Blank lines and comments can come before property drawers in the zeroth section
+:PROPERTIES:
+:FOO:    bar
+:END:
+
+
+
+* Spaces turn property drawers into regular drawers
+
+:PROPERTIES:
+:FOO:    bar
+:END:
+* Comments turn property drawers into regular drawers
+# Comment
+:PROPERTIES:
+:FOO:    bar
+:END:
+* Baseline
+:PROPERTIES:
+:FOO:    bar
+:END:

org_mode_samples/greater_element/property_drawer/zeroth_section/comment.org

@@ -1,4 +0,0 @@
-# lorem
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/zeroth_section/comment_space.org

@@ -1,5 +0,0 @@
-# lorem
-
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/zeroth_section/immediate.org

@@ -1,3 +0,0 @@
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/zeroth_section/space.org

@@ -1,4 +0,0 @@
-
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/zeroth_section/space_comment_space.org

@@ -1,12 +0,0 @@
-
-
-
-
-# lorem
-
-
-
-
-:PROPERTIES:
-:FOO:    bar
-:END:

org_mode_samples/greater_element/property_drawer/zeroth_section_spaces_after_comment.org

@@ -0,0 +1,12 @@
+
+
+
+
+# Blank lines and comments can come before property drawers in the zeroth section
+
+
+
+
+:PROPERTIES:
+:FOO:    bar
+:END:

src/compare/diff.rs

@@ -455,27 +455,6 @@ fn _compare_document<'b, 's>(
     let mut child_status = Vec::new();
     let mut message = None;
 
-    let additional_property_names: Vec<String> = rust
-        .get_additional_properties()
-        .map(|node_property| format!(":{}", node_property.property_name.to_uppercase()))
-        .collect();
-
-    let additional_properties: Vec<(String, &str)> = rust
-        .get_additional_properties()
-        .map(|node_property| {
-            (
-                format!(":{}", node_property.property_name.to_uppercase()),
-                node_property.value.unwrap_or(""),
-            )
-        })
-        .collect();
-
-    compare_additional_properties(emacs, additional_properties.into_iter())?.apply(
-        &mut child_status,
-        &mut this_status,
-        &mut message,
-    );
-
     compare_children_iter(
         source,
         emacs,
@@ -489,10 +468,6 @@ fn _compare_document<'b, 's>(
         source,
         emacs,
         rust,
-        additional_property_names
-            .iter()
-            .map(String::as_str)
-            .map(EmacsField::Required),
         (
             EmacsField::Required(":path"),
             |r| r.path.as_ref().map(|p| p.to_str()).flatten(),

src/types/document.rs

@@ -93,7 +93,8 @@ impl<'s> Heading<'s> {
     }
 
     pub fn get_additional_properties(&self) -> impl Iterator<Item = &NodeProperty<'s>> {
-        self.children
+        let foo = self
+            .children
             .iter()
             .take(1)
             .filter_map(|c| match c {
@@ -106,28 +107,7 @@ impl<'s> Heading<'s> {
                 Element::PropertyDrawer(property_drawer) => Some(property_drawer),
                 _ => None,
             })
-            .flat_map(|property_drawer| property_drawer.children.iter())
+            .flat_map(|property_drawer| property_drawer.children.iter());
-    }
+        foo
-}
-
-impl<'s> Document<'s> {
-    pub fn get_additional_properties(&self) -> impl Iterator<Item = &NodeProperty<'s>> {
-        let zeroth_section_children = self
-            .zeroth_section
-            .iter()
-            .flat_map(|zeroth_section| zeroth_section.children.iter());
-        let property_drawer = zeroth_section_children
-            .take_while(|element| match element {
-                Element::Comment(_) => true,
-                Element::PropertyDrawer(_) => true,
-                _ => false,
-            })
-            .find_map(|element| match element {
-                Element::PropertyDrawer(property_drawer) => Some(property_drawer),
-                _ => None,
-            });
-        property_drawer
-            .into_iter()
-            .flat_map(|property_drawer| property_drawer.children.iter())
     }
 }