Add solver conflict output on segments (#9298)

* Add solver conflict output on segments

* Condense matches and add comments

Author: jtran

rust/kcl-lib/src/execution/exec_ast.rs

@@ -1440,11 +1440,10 @@ fn substitute_sketch_var_in_unsolved_expr(
                     source_ranges.to_vec(),
                 )));
             };
-            // TODO: sketch-api: This isn't implemented properly yet.
-            // solve_outcome.unsatisfied.contains means "Fixed or over-constrained"
             let freedom = if solve_outcome.unsatisfied.contains(&var_id.0) {
-                Freedom::Free
+                Freedom::Conflict
             } else {
+                // TODO: sketch-api: This isn't implemented properly yet.
                 Freedom::Fixed
             };
             Ok((TyF64::new(*solution, solution_ty), freedom))

rust/kcl-lib/src/frontend/sketch.rs

@@ -113,24 +113,21 @@ pub struct Point {
 #[ts(export, export_to = "FrontendApi.ts")]
 pub enum Freedom {
     Free,
-    Partial,
     Fixed,
+    Conflict,
 }
 
 impl Freedom {
+    /// Merges two Freedom values. For example, a point has a solver variable
+    /// for each dimension, x and y. If one dimension is `Free` and the other is
+    /// `Fixed`, the point overall is `Free` since it isn't fully constrained.
+    /// `Conflict` infects the most, followed by `Free`. An object must be fully
+    /// `Fixed` to be `Fixed` overall.
     pub fn merge(self, other: Self) -> Self {
-        match self {
-            Self::Free => match other {
-                Self::Free => Self::Free,
-                Self::Partial => Self::Partial,
-                Self::Fixed => Self::Partial,
-            },
-            Self::Partial => Self::Partial,
-            Self::Fixed => match other {
-                Self::Free => Self::Partial,
-                Self::Partial => Self::Partial,
-                Self::Fixed => Self::Fixed,
-            },
+        match (self, other) {
+            (Self::Conflict, _) | (_, Self::Conflict) => Self::Conflict,
+            (Self::Free, _) | (_, Self::Free) => Self::Free,
+            (Self::Fixed, Self::Fixed) => Self::Fixed,
         }
     }
 }