diff --git a/crates/doc/src/lineage.rs b/crates/doc/src/lineage.rs index a5a3c61f1..d0ad415cd 100644 --- a/crates/doc/src/lineage.rs +++ b/crates/doc/src/lineage.rs @@ -749,10 +749,13 @@ pub(crate) fn order_lumps(bodies: &mut [crate::ModelBody], origin: &Arc> = members.iter().map(|i| bodies.get(*i).and_then(least).map(|k| (k, *i))).collect(); let Some(mut keys) = keys else { continue }; keys.sort(); - let names: Vec = members.iter().filter_map(|i| bodies.get(*i).map(|b| b.name.clone())).collect(); - for (name, (_, i)) in names.into_iter().zip(keys) { + // A name goes with the feature that made it: the piece taking the first name is the body + // the feature was given, whichever piece the kernel lists first. + let names: Vec<(String, u64)> = members.iter().filter_map(|i| bodies.get(*i).map(|b| (b.name.clone(), b.feature))).collect(); + for ((name, feature), (_, i)) in names.into_iter().zip(keys) { if let Some(b) = bodies.get_mut(i) { b.name = name; + b.feature = feature; } } } diff --git a/crates/engine/src/cmd/surface_analysis.rs b/crates/engine/src/cmd/surface_analysis.rs index 11bf168a9..b5c257bb7 100644 --- a/crates/engine/src/cmd/surface_analysis.rs +++ b/crates/engine/src/cmd/surface_analysis.rs @@ -167,8 +167,9 @@ fn set(s: &mut Session, p: &Value, a: SurfaceAnalysis) -> Result { if bool_(p, "clear").unwrap_or(false) { s.analysis = None; } else { - s.analyses_off(Some(a.command())); + // In this order: a replaced analysis keeps its status slot. s.analysis = Some(a); + s.analyses_off(Some(a.command())); } s.status_analysis_changed((!bool_(p, "clear").unwrap_or(false)).then_some(crate::status_items::StatusId::SurfaceAnalysis)); s.revision += 1; diff --git a/crates/engine/src/frames.rs b/crates/engine/src/frames.rs index 4ded06780..3539a0fb7 100644 --- a/crates/engine/src/frames.rs +++ b/crates/engine/src/frames.rs @@ -425,7 +425,9 @@ impl Drop for Nested { /// `params` with world picks mapped into component frames (`None`: nothing to change). A model /// that cannot be placed is the error. pub fn to_local(s: &Session, id: &str, params: &Value) -> crate::Result> { - if !placed(s) { + // A command with no world picks has nothing to map, and may not need the bodies placed. + let picks = !table(id).is_empty() || matches!(id, "library.apply" | "timeline.redefine" | "sketch.redefine"); + if !picks || !placed(s) { return Ok(None); } let world = s.world_state()?; diff --git a/crates/engine/src/schema/types.rs b/crates/engine/src/schema/types.rs index 1c7e641b8..48ecc48a4 100644 --- a/crates/engine/src/schema/types.rs +++ b/crates/engine/src/schema/types.rs @@ -1180,9 +1180,6 @@ pub struct FeatureCommon { /// feature. #[serde(default)] pub participants: Option, - /// What a join makes of pieces that share no face. Default: separate. - #[serde(default)] - pub touching: Option, } /// Deserializes a flattened [`FeatureCommon`] (or [`ConstructionCommon`], [`PlaneCommon`]) from diff --git a/crates/io/build.rs b/crates/io/build.rs index d135732ea..8174edbc5 100644 --- a/crates/io/build.rs +++ b/crates/io/build.rs @@ -13,7 +13,7 @@ use std::process::Command; /// The workspace crates a design's model is computed from: `doc` and every workspace crate it /// depends on (a test checks the list against their manifests). -const EVALUATION_CRATES: [&str; 6] = ["geom", "sketch", "kernel", "render", "derive", "doc"]; +const EVALUATION_CRATES: [&str; 9] = ["geom", "profile", "smlib", "step", "sketch", "kernel", "render", "derive", "doc"]; /// The other files the saved model depends on, relative to the workspace root. const EVALUATION_FILES: [&str; 3] = ["crates/io/build.rs", "crates/io/src/design/native_cache.rs", ".cargo/config.toml"]; /// What under `vendor/` does not compute models: notes, and the interface's renderer. diff --git a/tests/KNOWN_FAILING_TESTS b/tests/KNOWN_FAILING_TESTS index 9a5c194fc..0a7c47c6c 100644 --- a/tests/KNOWN_FAILING_TESTS +++ b/tests/KNOWN_FAILING_TESTS @@ -10,6 +10,8 @@ # Baseline: develop 38fd4a4f6 (CI run 41157648345, x86_64 Linux), after the SMLib eaa998a pin. solidcraft-cli::action_matrix::action_matrix_sample 3 baseline actions fail on SMLib: 2 shells (Bad Loop Orient on issue-616-lid-ribs; status 1001 on filleted-shelled-box, shelled again open at an inner wall), 1 fillet (SmSurfOfRevolution Test #7 on oblique_cut_of_cylinder) solidcraft-cli::naming_corpus::corpus_designs_name_alike_every_build_and_fail_where_a_reference_is_gone oracle/83-boundary-loop-thicken does not load: step 8, SMLib thicken status 1001 +solidcraft-engine::cmd::sketch::face::tests::a_sketch_on_the_ring_of_a_lid_underside_parted_by_its_lip_keeps_the_cap main's test: on SMLib the ring is named F14:start#[...], the lid's own start, not F2:top, the case's top it rests on, so the lookup finds no ring +solidcraft-engine::cmd::sketch::ids_tests::a_curve_id_that_cannot_be_written_into_a_name_is_refused main's test: an extruded circle on SMLib has a seam edge, the side face on both its sides, named F2:side:c1 with no second face solidcraft-engine::tests::fillet_fit_taper_closes_to_a_point SMLib fillet status 1001 on the taper fit (radius 16 closing to 0) solidcraft-kernel::blend::corner_tests::a_round_ending_in_an_earlier_round_matches_both_together SMLib fillet status 1001 on the round that ends in the earlier one solidcraft-kernel::blend::corner_tests::corner_blends_hold_at_any_scale at 0.01x the arc case's rounds remove 72.783 (scaled back) against 72.713 at 1x (9.6e-4 off, 1e-4 allowed)