talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Bubble up planning variables to the headline.

Browse Source
This commit is contained in:
Tom Alexander
2023-10-02 20:37:46 -04:00
parent 2e1a946ac9
commit a80d171e4d
4 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/compare/diff.rs
View File

@@ -719,9 +719,58 @@ fn compare_heading<'b, 's>(
));
}
// TODO: Compare :pre-blank :scheduled :closed
//
// :scheduled and :closed seem to only appear when the headline has a planning
// Compare scheduled
let scheduled = get_property(emacs, ":scheduled")?;
match (scheduled, &rust.scheduled) {
(None, None) => {}
(None, Some(_)) | (Some(_), None) => {
this_status = DiffStatus::Bad;
message = Some(format!(
"Scheduled mismatch (emacs != rust) {:?} != {:?}",
scheduled, rust.scheduled
));
}
(Some(emacs_child), Some(rust_child)) => {
let result = compare_ast_node(source, emacs_child, rust_child.into())?;
child_status.push(artificial_diff_scope("scheduled", vec![result])?);
}
}
// Compare deadline
let deadline = get_property(emacs, ":deadline")?;
match (deadline, &rust.deadline) {
(None, None) => {}
(None, Some(_)) | (Some(_), None) => {
this_status = DiffStatus::Bad;
message = Some(format!(
"Deadline mismatch (emacs != rust) {:?} != {:?}",
deadline, rust.deadline
));
}
(Some(emacs_child), Some(rust_child)) => {
let result = compare_ast_node(source, emacs_child, rust_child.into())?;
child_status.push(artificial_diff_scope("deadline", vec![result])?);
}
}
// Compare closed
let closed = get_property(emacs, ":closed")?;
match (closed, &rust.closed) {
(None, None) => {}
(None, Some(_)) | (Some(_), None) => {
this_status = DiffStatus::Bad;
message = Some(format!(
"Closed mismatch (emacs != rust) {:?} != {:?}",
closed, rust.closed
));
}
(Some(emacs_child), Some(rust_child)) => {
let result = compare_ast_node(source, emacs_child, rust_child.into())?;
child_status.push(artificial_diff_scope("closed", vec![result])?);
}
}
// TODO: Compare :pre-blank
// Compare section
let section_status = children
@@ -1402,7 +1451,7 @@ fn compare_diary_sexp<'b, 's>(
}
fn compare_planning<'b, 's>(
_source: &'s str,
source: &'s str,
emacs: &'b Token<'s>,
rust: &'b Planning<'s>,
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
@@ -1422,7 +1471,7 @@ fn compare_planning<'b, 's>(
));
}
(Some(emacs_child), Some(rust_child)) => {
let result = compare_ast_node(_source, emacs_child, rust_child.into())?;
let result = compare_ast_node(source, emacs_child, rust_child.into())?;
child_status.push(artificial_diff_scope("scheduled", vec![result])?);
}
}
@@ -1439,7 +1488,7 @@ fn compare_planning<'b, 's>(
));
}
(Some(emacs_child), Some(rust_child)) => {
let result = compare_ast_node(_source, emacs_child, rust_child.into())?;
let result = compare_ast_node(source, emacs_child, rust_child.into())?;
child_status.push(artificial_diff_scope("deadline", vec![result])?);
}
}
@@ -1456,7 +1505,7 @@ fn compare_planning<'b, 's>(
));
}
(Some(emacs_child), Some(rust_child)) => {
let result = compare_ast_node(_source, emacs_child, rust_child.into())?;
let result = compare_ast_node(source, emacs_child, rust_child.into())?;
child_status.push(artificial_diff_scope("closed", vec![result])?);
}
}