Break into function to be more readable

Author: adamchalmers

rust/kcl-lib/src/std/extrude.rs

@@ -730,6 +730,41 @@ pub enum BeingExtruded {
     Face { face_id: Uuid, solid_id: Uuid },
 }
 
+/// Which edge should we use for querying Solid3dGetExtrusionInfo and GetAdjacencyInfo?
+/// It can be any edge of the body, but if our body is a clone, we should use an edge of
+/// the original body, not the new cloned body.
+fn get_extrusion_info_edge_id(sketch: &Sketch, any_edge_id: Uuid, clone_id_map: Option<&HashMap<Uuid, Uuid>>) -> Uuid {
+    // If this isn't a clone, there's no old/new body distinction.
+    // So just use the edge.
+    if sketch.clone.is_none() {
+        return any_edge_id;
+    }
+    let Some(clone_map) = clone_id_map else {
+        return any_edge_id;
+    };
+
+    // clone_map maps old IDs -> new IDs.
+    // If the `any_edge_id` is an ID of the OLD body
+    // (we know this if it's a _key_ of the map)
+    // we should use it (because that's the old body we're querying).
+    if clone_map.contains_key(&any_edge_id) {
+        return any_edge_id;
+    }
+
+    // Otherwise, if the `any_edge_id` is an ID of the NEW body
+    // (we know this if it's a _value_ of the map),
+    // we should query the corresponding ID in the OLD body.
+    // i.e. if it's a hashmap value, find the corresponding key.
+    if let Some((old_edge_id, _)) = clone_map.iter().find(|(_, new_edge_id)| **new_edge_id == any_edge_id) {
+        return *old_edge_id;
+    }
+
+    // Fall back to this if the clone_map doesn't have the data we expect.
+    // Probably will fail in the engine because it means the clone map was built wrong,
+    // or KCL and the engine disagree about what geometry exists.
+    any_edge_id
+}
+
 #[allow(clippy::too_many_arguments)]
 pub(crate) async fn do_post_extrude<'a>(
     sketch: &Sketch,
@@ -772,33 +807,7 @@ pub(crate) async fn do_post_extrude<'a>(
 
     // If the sketch is a clone, we will use the original info to get the extrusion face info.
     // So let's find an edge of the old body.
-    let extrusion_info_edge_id = if sketch.clone.is_some() && clone_id_map.is_some() {
-        if let Some(clone_map) = clone_id_map {
-            // clone_map maps old IDs -> new IDs.
-            // If the `any_edge_id` is an ID of the OLD body
-            // (we know this if it's a _key_ of the map)
-            // we should use it (because that's the old body we're querying).
-            if clone_map.contains_key(&any_edge_id) {
-                any_edge_id
-                // Otherwise, if the `any_edge_id` is an ID of the NEW body
-                // (we know this if it's a _value_ of the map),
-                // we should query the corresponding ID in the OLD body.
-                // i.e. if it's a hashmap value, find the corresponding key.
-            } else if let Some((old_edge_id, _)) =
-                clone_map.iter().find(|(_, new_edge_id)| **new_edge_id == any_edge_id)
-            {
-                *old_edge_id
-            } else {
-                any_edge_id
-            }
-        } else {
-            any_edge_id
-        }
-    // If this isn't a clone, there's no old/new body distinction.
-    // So just use the edge.
-    } else {
-        any_edge_id
-    };
+    let extrusion_info_edge_id = get_extrusion_info_edge_id(sketch, any_edge_id, clone_id_map);
     let mut sketch = sketch.clone();
     match body_type {
         BodyType::Solid => {