diff --git a/crates/engine/src/cmd/datamerge.rs b/crates/engine/src/cmd/datamerge.rs index 1adbbcbdc..fe565d679 100644 --- a/crates/engine/src/cmd/datamerge.rs +++ b/crates/engine/src/cmd/datamerge.rs @@ -147,11 +147,12 @@ fn fields_cmd(s: &mut Session, p: &Value) -> Result { let Some(src) = st.doc.data_merge.sources.first() else { return Ok(json!([])); }; - let placeholders = &st.doc.data_merge.placeholders; + let doc = st.preview_stash.as_deref().unwrap_or(st.doc.as_ref()); + let placeholders = &doc.data_merge.placeholders; let mut marker_counts = std::collections::HashMap::::new(); - for (story_id, story) in &st.doc.stories { + for (story_id, story) in &doc.stories { // The generated endnote frame repeats note text already counted in its owning story. - if Some(*story_id) == st.doc.endnote_story { + if Some(*story_id) == doc.endnote_story { continue; } for (start, end, name) in fill::find_markers(&story.text) { diff --git a/crates/engine/src/cmd/datamerge/tests.rs b/crates/engine/src/cmd/datamerge/tests.rs index cda4f2072..3515d665e 100644 --- a/crates/engine/src/cmd/datamerge/tests.rs +++ b/crates/engine/src/cmd/datamerge/tests.rs @@ -1657,6 +1657,7 @@ fn a_field_converted_into_a_table_is_filled_in_its_cell() { assert_eq!(exec(&mut s, "data.fields", json!({}))[0]["uses"], 1); exec(&mut s, "data.preview", json!({"record": 1})); assert_eq!(cell_texts(&s), ["Name", "Ada"], "the field is filled in its cell"); + assert_eq!(exec(&mut s, "data.fields", json!({}))[0]["uses"], 1, "the count reads the unfilled template while previewing"); } /// A table `Who⇥Where` with the caret in its second cell, and a source with `Name` and `City`.