Fix git merge conflicts from Helix and Cache work

docs/kcl/helix.md

@@ -49,7 +49,7 @@ springSketch = startSketchOn('YZ')
 // Create a helix around an edge.
 helper001 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> line([0, 10], %, $edge001)
+  |> line(end = [0, 10], tag = $edge001)
 
 helixPath = helix({
   angleStart = 0,

src/wasm-lib/kcl/src/std/helix.rs

@@ -67,7 +67,7 @@ pub async fn helix(exec_state: &mut ExecState, args: Args) -> Result<KclValue, K
 /// // Create a helix around an edge.
 /// helper001 = startSketchOn('XZ')
 ///  |> startProfileAt([0, 0], %)
-///  |> line([0, 10], %, $edge001)
+///  |> line(end = [0, 10], tag = $edge001)
 ///
 /// helixPath = helix({
 ///     angleStart = 0,

src/wasm-lib/tests/executor/cache.rs

@@ -225,17 +225,17 @@ async fn kcl_test_cache_change_highlight_edges_changes_visual() {
 async fn kcl_test_cache_add_line_preserves_artifact_commands() {
     let code = r#"sketch001 = startSketchOn('XY')
   |> startProfileAt([5.5229, 5.25217], %)
-  |> line([10.50433, -1.19122], %)
-  |> line([8.01362, -5.48731], %)
-  |> line([-1.02877, -6.76825], %)
-  |> line([-11.53311, 2.81559], %)
-  |> close(%)
+  |> line(end = [10.50433, -1.19122])
+  |> line(end = [8.01362, -5.48731])
+  |> line(end = [-1.02877, -6.76825])
+  |> line(end = [-11.53311, 2.81559])
+  |> close()
 "#;
     // Use a new statement; don't extend the prior pipeline.  This allows us to
     // detect a prefix.
     let code_with_extrude = code.to_owned()
         + r#"
-extrude(4, sketch001)
+extrude(sketch001, length = 4)
 "#;
 
     let result = cache_test(

src/wasm-lib/tests/executor/inputs/close_arc.kcl

@@ -4,6 +4,6 @@ const height = 3
 
 const body = startSketchOn('XY')
       |> startProfileAt([center[0]+radius, center[1]], %)
-      |> arc({angle_end = 360, angle_start = 0, radius}, %)
+      |> arc({angleEnd: 360, angleStart: 0, radius}, %)
       |> close()
       |> extrude(length = height)

src/wasm-lib/tests/executor/inputs/helix_defaults.kcl

@@ -1,4 +1,4 @@
 const part001 = startSketchOn('XY')
      |> circle({ center: [5, 5], radius: 10 }, %)
      |> extrude(length = 10)
-     |> helixRevolutions({revolutions = 16, angle_start = 0}, %)
+     |> helixRevolutions({revolutions = 16, angleStart = 0}, %)

src/wasm-lib/tests/executor/inputs/helix_defaults_negative_extrude.kcl

@@ -1,4 +1,4 @@
 const part001 = startSketchOn('XY')
      |> circle({ center: [5, 5], radius: 10 }, %)
      |> extrude(length = -10)
-     |> helixRevolutions({revolutions = 16, angle_start = 0}, %)
+     |> helixRevolutions({revolutions = 16, angleStart = 0}, %)

src/wasm-lib/tests/executor/inputs/helix_with_length.kcl

@@ -1,4 +1,4 @@
 const part001 = startSketchOn('XY')
      |> circle({ center: [5, 5], radius: 10 }, %)
      |> extrude(length = 10)
-     |> helix({revolutions = 16, angle_start = 0, length = 3}, %)
+     |> helixRevolutions({revolutions = 16, angleStart = 0, length = 3}, %)