Merge branch 'main' into pierremtb/issue5101-Allow-feature-tree-selection-for-point-and-click-Sweep

Relates to #5101

.github/workflows/e2e-tests.yml

@@ -126,20 +126,20 @@ jobs:
     - name: build electron
       shell: bash
       run: yarn tron:package
-    # - name: Run ubuntu/chrome snapshots
-    #   if: ${{ matrix.os == 'namespace-profile-ubuntu-8-cores' && matrix.shardIndex == 1 }}
-    #   shell: bash
-    #   # TODO: break this in its own job, for now it's not slowing down the overall execution as ubuntu is the quickest,
-    #   # but we could do better. This forces a large 1/1 shard of all 20 snapshot tests that runs in about 3 minutes.
-    #   run: |
-    #     PLATFORM=web yarn playwright test --config=playwright.config.ts --retries="3" --update-snapshots --grep=@snapshot  --shard=1/1
-    #   env:
-    #     CI: true
-    #     NODE_ENV: development
-    #     VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-    #     VITE_KC_SKIP_AUTH: true
-    #     token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-    #     snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
+    - name: Run ubuntu/chrome snapshots
+      if: ${{ matrix.os == 'namespace-profile-ubuntu-8-cores' && matrix.shardIndex == 1 }}
+      shell: bash
+      # TODO: break this in its own job, for now it's not slowing down the overall execution as ubuntu is the quickest,
+      # but we could do better. This forces a large 1/1 shard of all 20 snapshot tests that runs in about 3 minutes.
+      run: |
+        PLATFORM=web yarn playwright test --config=playwright.config.ts --retries="3" --update-snapshots --grep=@snapshot  --shard=1/1
+      env:
+        CI: true
+        NODE_ENV: development
+        VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+        VITE_KC_SKIP_AUTH: true
+        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+        snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       with:
@@ -162,20 +162,20 @@ jobs:
           then echo "modified=true" >> $GITHUB_OUTPUT
           else echo "modified=false" >> $GITHUB_OUTPUT
           fi
-    # - name: Commit changes, if any
-    #   if: steps.git-check.outputs.modified == 'true'
-    #   shell: bash
-    #   run: |
-    #     git add .
-    #     git config --local user.email "github-actions[bot]@users.noreply.github.com"
-    #     git config --local user.name "github-actions[bot]"
-    #     git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
-    #     git fetch origin
-    #     echo ${{ github.head_ref }}
-    #     git checkout ${{ github.head_ref }}
-    #     git commit -am "A snapshot a day keeps the bugs away! 📷🐛 (OS: ${{matrix.os}})" || true
-    #     git push
-    #     git push origin ${{ github.head_ref }}
+    - name: Commit changes, if any
+      if: steps.git-check.outputs.modified == 'true'
+      shell: bash
+      run: |
+        git add .
+        git config --local user.email "github-actions[bot]@users.noreply.github.com"
+        git config --local user.name "github-actions[bot]"
+        git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
+        git fetch origin
+        echo ${{ github.head_ref }}
+        git checkout ${{ github.head_ref }}
+        git commit -am "A snapshot a day keeps the bugs away! 📷🐛 (OS: ${{matrix.os}})" || true
+        git push
+        git push origin ${{ github.head_ref }}
     # only upload artifacts if there's actually changes
     - uses: actions/upload-artifact@v4
       if: steps.git-check.outputs.modified == 'true'

.gitignore

@@ -25,7 +25,6 @@ yarn-error.log*
 
 .idea
 .vscode
-.helix
 src/wasm-lib/.idea
 src/wasm-lib/.vscode
 
@@ -45,7 +44,7 @@ e2e/playwright/temp3.png
 e2e/playwright/export-snapshots/*
 !e2e/playwright/export-snapshots/*.png
 
-/kcl-samples
+
 /test-results/
 /playwright-report/
 /blob-report/

.helix/config.toml

@@ -1,2 +0,0 @@
-[editor]
-auto-format = true

.helix/languages.toml

@@ -1,10 +0,0 @@
-[language-server.eslint]
-args = ["--stdio"]
-command = "vscode-eslint-language-server"
-
-[[language]]
-name = "typescript"
-auto-format = true
-formatter = { command = "node_modules/.bin/prettier", args = ["--parser", "typescript"] }
-language-servers = [ { name = "eslint", only-features = [ "diagnostics" ] }, "typescript-language-server" ]
-

docs/kcl/appearance.md

@@ -31,12 +31,12 @@ appearance(data: AppearanceData, solid_set: SolidSet) -> SolidSet
 // Add color to an extruded solid.
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
-  |> line(endAbsolute = [10, 0])
-  |> line(endAbsolute = [0, 10])
-  |> line(endAbsolute = [-10, 0])
-  |> close()
+  |> lineTo([10, 0], %)
+  |> lineTo([0, 10], %)
+  |> lineTo([-10, 0], %)
+  |> close(%)
 
-example = extrude(exampleSketch, length = 5)
+example = extrude(5, exampleSketch)
   |> appearance({
        color = '#ff0000',
        metalness = 50,
@@ -65,11 +65,11 @@ sketch001 = startSketchOn('XY')
 fn cube(center) {
   return startSketchOn('XY')
     |> startProfileAt([center[0] - 10, center[1] - 10], %)
-    |> line(endAbsolute = [center[0] + 10, center[1] - 10])
-    |> line(endAbsolute = [center[0] + 10, center[1] + 10])
-    |> line(endAbsolute = [center[0] - 10, center[1] + 10])
-    |> close()
-    |> extrude(length = 10)
+    |> lineTo([center[0] + 10, center[1] - 10], %)
+    |> lineTo([center[0] + 10, center[1] + 10], %)
+    |> lineTo([center[0] - 10, center[1] + 10], %)
+    |> close(%)
+    |> extrude(10, %)
 }
 
 example0 = cube([0, 0])
@@ -95,11 +95,11 @@ appearance({
 // This example shows setting the appearance _after_ the shell.
 firstSketch = startSketchOn('XY')
   |> startProfileAt([-12, 12], %)
-  |> line(end = [24, 0])
-  |> line(end = [0, -24])
-  |> line(end = [-24, 0])
-  |> close()
-  |> extrude(length = 6)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
 
 shell({ faces = ['end'], thickness = 0.25 }, firstSketch)
   |> appearance({
@@ -116,11 +116,11 @@ shell({ faces = ['end'], thickness = 0.25 }, firstSketch)
 // This example shows setting the appearance _before_ the shell.
 firstSketch = startSketchOn('XY')
   |> startProfileAt([-12, 12], %)
-  |> line(end = [24, 0])
-  |> line(end = [0, -24])
-  |> line(end = [-24, 0])
-  |> close()
-  |> extrude(length = 6)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
   |> appearance({
        color = '#ff0000',
        metalness = 90,
@@ -137,12 +137,12 @@ shell({ faces = ['end'], thickness = 0.25 }, firstSketch)
 // This example shows _before_ the pattern.
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> line(end = [0, 2])
-  |> line(end = [3, 1])
-  |> line(end = [0, -4])
-  |> close()
+  |> line([0, 2], %)
+  |> line([3, 1], %)
+  |> line([0, -4], %)
+  |> close(%)
 
-example = extrude(exampleSketch, length = 1)
+example = extrude(1, exampleSketch)
   |> appearance({
        color = '#ff0000',
        metalness = 90,
@@ -162,12 +162,12 @@ example = extrude(exampleSketch, length = 1)
 // This example shows _after_ the pattern.
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> line(end = [0, 2])
-  |> line(end = [3, 1])
-  |> line(end = [0, -4])
-  |> close()
+  |> line([0, 2], %)
+  |> line([3, 1], %)
+  |> line([0, -4], %)
+  |> close(%)
 
-example = extrude(exampleSketch, length = 1)
+example = extrude(1, exampleSketch)
   |> patternLinear3d({
        axis = [1, 0, 1],
        instances = 7,
@@ -186,10 +186,10 @@ example = extrude(exampleSketch, length = 1)
 // Color the result of a 2D pattern that was extruded.
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([.5, 25], %)
-  |> line(end = [0, 5])
-  |> line(end = [-1, 0])
-  |> line(end = [0, -5])
-  |> close()
+  |> line([0, 5], %)
+  |> line([-1, 0], %)
+  |> line([0, -5], %)
+  |> close(%)
   |> patternCircular2d({
        center = [0, 0],
        instances = 13,
@@ -197,7 +197,7 @@ exampleSketch = startSketchOn('XZ')
        rotateDuplicates = true
      }, %)
 
-example = extrude(exampleSketch, length = 1)
+example = extrude(1, exampleSketch)
   |> appearance({
        color = '#ff0000',
        metalness = 90,
@@ -214,11 +214,11 @@ example = extrude(exampleSketch, length = 1)
 // Create a path for the sweep.
 sweepPath = startSketchOn('XZ')
   |> startProfileAt([0.05, 0.05], %)
-  |> line(end = [0, 7])
+  |> line([0, 7], %)
   |> tangentialArc({ offset = 90, radius = 5 }, %)
-  |> line(end = [-3, 0])
+  |> line([-3, 0], %)
   |> tangentialArc({ offset = -90, radius = 5 }, %)
-  |> line(end = [0, 7])
+  |> line([0, 7], %)
 
 pipeHole = startSketchOn('XY')
   |> circle({ center = [0, 0], radius = 1.5 }, %)

docs/kcl/fillet.md

@@ -36,12 +36,12 @@ filletRadius = 2
 
 mountingPlateSketch = startSketchOn("XY")
   |> startProfileAt([-width / 2, -length / 2], %)
-  |> line(endAbsolute = [width / 2, -length / 2], tag = $edge1)
-  |> line(endAbsolute = [width / 2, length / 2], tag = $edge2)
-  |> line(endAbsolute = [-width / 2, length / 2], tag = $edge3)
-  |> close(tag = $edge4)
+  |> lineTo([width / 2, -length / 2], %, $edge1)
+  |> lineTo([width / 2, length / 2], %, $edge2)
+  |> lineTo([-width / 2, length / 2], %, $edge3)
+  |> close(%, $edge4)
 
-mountingPlate = extrude(mountingPlateSketch, length = thickness)
+mountingPlate = extrude(thickness, mountingPlateSketch)
   |> fillet({
        radius = filletRadius,
        tags = [
@@ -63,12 +63,12 @@ filletRadius = 1
 
 mountingPlateSketch = startSketchOn("XY")
   |> startProfileAt([-width / 2, -length / 2], %)
-  |> line(endAbsolute = [width / 2, -length / 2], tag = $edge1)
-  |> line(endAbsolute = [width / 2, length / 2], tag = $edge2)
-  |> line(endAbsolute = [-width / 2, length / 2], tag = $edge3)
-  |> close(tag = $edge4)
+  |> lineTo([width / 2, -length / 2], %, $edge1)
+  |> lineTo([width / 2, length / 2], %, $edge2)
+  |> lineTo([-width / 2, length / 2], %, $edge3)
+  |> close(%, $edge4)
 
-mountingPlate = extrude(mountingPlateSketch, length = thickness)
+mountingPlate = extrude(thickness, mountingPlateSketch)
   |> fillet({
        radius = filletRadius,
        tolerance = 0.000001,

docs/kcl/getNextAdjacentEdge.md

@@ -29,14 +29,14 @@ getNextAdjacentEdge(tag: TagIdentifier) -> Uuid
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> line(end = [10, 0])
+  |> line([10, 0], %)
   |> angledLine({ angle = 60, length = 10 }, %)
   |> angledLine({ angle = 120, length = 10 }, %)
-  |> line(end = [-10, 0])
+  |> line([-10, 0], %)
   |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
-  |> close()
+  |> close(%)
 
-example = extrude(exampleSketch, length = 5)
+example = extrude(5, exampleSketch)
   |> fillet({
        radius = 3,
        tags = [getNextAdjacentEdge(referenceEdge)]

docs/kcl/getOppositeEdge.md

@@ -29,14 +29,14 @@ getOppositeEdge(tag: TagIdentifier) -> Uuid
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> line(end = [10, 0])
+  |> line([10, 0], %)
   |> angledLine({ angle = 60, length = 10 }, %)
   |> angledLine({ angle = 120, length = 10 }, %)
-  |> line(end = [-10, 0])
+  |> line([-10, 0], %)
   |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
-  |> close()
+  |> close(%)
 
-example = extrude(exampleSketch, length = 5)
+example = extrude(5, exampleSketch)
   |> fillet({
        radius = 3,
        tags = [getOppositeEdge(referenceEdge)]

docs/kcl/getPreviousAdjacentEdge.md

@@ -29,14 +29,14 @@ getPreviousAdjacentEdge(tag: TagIdentifier) -> Uuid
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> line(end = [10, 0])
+  |> line([10, 0], %)
   |> angledLine({ angle = 60, length = 10 }, %)
   |> angledLine({ angle = 120, length = 10 }, %)
-  |> line(end = [-10, 0])
+  |> line([-10, 0], %)
   |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
-  |> close()
+  |> close(%)
 
-example = extrude(exampleSketch, length = 5)
+example = extrude(5, exampleSketch)
   |> fillet({
        radius = 3,
        tags = [getPreviousAdjacentEdge(referenceEdge)]

docs/kcl/helix.md

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

docs/kcl/helixRevolutions.md

@@ -30,7 +30,7 @@ helixRevolutions(data: HelixRevolutionsData, solid: Solid) -> Solid
 ```js
 part001 = startSketchOn('XY')
   |> circle({ center = [5, 5], radius = 10 }, %)
-  |> extrude(length = 10)
+  |> extrude(10, %)
   |> helixRevolutions({
        angleStart = 0,
        ccw = true,

docs/kcl/hollow.md

@@ -31,11 +31,11 @@ hollow(thickness: number, solid: Solid) -> Solid
 // Hollow a basic sketch.
 firstSketch = startSketchOn('XY')
   |> startProfileAt([-12, 12], %)
-  |> line(end = [24, 0])
-  |> line(end = [0, -24])
-  |> line(end = [-24, 0])
-  |> close()
-  |> extrude(length = 6)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
   |> hollow(0.25, %)
 ```
 
@@ -45,11 +45,11 @@ firstSketch = startSketchOn('XY')
 // Hollow a basic sketch.
 firstSketch = startSketchOn('-XZ')
   |> startProfileAt([-12, 12], %)
-  |> line(end = [24, 0])
-  |> line(end = [0, -24])
-  |> line(end = [-24, 0])
-  |> close()
-  |> extrude(length = 6)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
   |> hollow(0.5, %)
 ```
 
@@ -60,25 +60,25 @@ firstSketch = startSketchOn('-XZ')
 size = 100
 case = startSketchOn('-XZ')
   |> startProfileAt([-size, -size], %)
-  |> line(end = [2 * size, 0])
-  |> line(end = [0, 2 * size])
+  |> line([2 * size, 0], %)
+  |> line([0, 2 * size], %)
   |> tangentialArcTo([-size, size], %)
-  |> close()
-  |> extrude(length = 65)
+  |> close(%)
+  |> extrude(65, %)
 
 thing1 = startSketchOn(case, 'end')
   |> circle({
        center = [-size / 2, -size / 2],
        radius = 25
      }, %)
-  |> extrude(length = 50)
+  |> extrude(50, %)
 
 thing2 = startSketchOn(case, 'end')
   |> circle({
        center = [size / 2, -size / 2],
        radius = 25
      }, %)
-  |> extrude(length = 50)
+  |> extrude(50, %)
 
 hollow(0.5, case)
 ```

docs/kcl/import.md

@@ -4,16 +4,14 @@ excerpt: "Import a CAD file."
 layout: manual
 ---
 
-**WARNING:** This function is deprecated.
-
 Import a CAD file.
 
-**DEPRECATED** Prefer to use import statements.
-
 For formats lacking unit data (such as STL, OBJ, or PLY files), the default unit of measurement is millimeters. Alternatively you may specify the unit by passing your desired measurement unit in the options parameter. When importing a GLTF file, the bin file will be imported as well. Import paths are relative to the current project directory.
 
 Note: The import command currently only works when using the native Modeling App.
 
+For importing KCL functions using the `import` statement, see the docs on [KCL modules](/docs/kcl/modules).
+
 ```js
 import(file_path: String, options?: ImportFormat) -> ImportedGeometry
 ```

docs/kcl/index.md

@@ -51,6 +51,7 @@ layout: manual
 * [`helixRevolutions`](kcl/helixRevolutions)
 * [`hole`](kcl/hole)
 * [`hollow`](kcl/hollow)
+* [`import`](kcl/import)
 * [`inch`](kcl/inch)
 * [`lastSegX`](kcl/lastSegX)
 * [`lastSegY`](kcl/lastSegY)
@@ -58,6 +59,7 @@ layout: manual
 * [`legAngY`](kcl/legAngY)
 * [`legLen`](kcl/legLen)
 * [`line`](kcl/line)
+* [`lineTo`](kcl/lineTo)
 * [`ln`](kcl/ln)
 * [`loft`](kcl/loft)
 * [`log`](kcl/log)

docs/kcl/int.md

@@ -38,7 +38,7 @@ assertEqual(n, 3, 0.0001, "5/2 = 2.5, rounded up makes 3")
 // Draw n cylinders.
 startSketchOn('XZ')
   |> circle({ center = [0, 0], radius = 2 }, %)
-  |> extrude(length = 5)
+  |> extrude(5, %)
   |> patternTransform(n, fn(id) {
     return { translate = [4 * id, 0, 0] }
   }, %)

docs/kcl/patternCircular3d.md

@@ -31,7 +31,7 @@ patternCircular3d(data: CircularPattern3dData, solid_set: SolidSet) -> [Solid]
 exampleSketch = startSketchOn('XZ')
   |> circle({ center = [0, 0], radius = 1 }, %)
 
-example = extrude(exampleSketch, length = -5)
+example = extrude(-5, exampleSketch)
   |> patternCircular3d({
        axis = [1, -1, 0],
        center = [10, -20, 0],

docs/kcl/patternLinear3d.md

@@ -30,12 +30,12 @@ patternLinear3d(data: LinearPattern3dData, solid_set: SolidSet) -> [Solid]
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> line(end = [0, 2])
-  |> line(end = [3, 1])
-  |> line(end = [0, -4])
-  |> close()
+  |> line([0, 2], %)
+  |> line([3, 1], %)
+  |> line([0, -4], %)
+  |> close(%)
 
-example = extrude(exampleSketch, length = 1)
+example = extrude(1, exampleSketch)
   |> patternLinear3d({
        axis = [1, 0, 1],
        instances = 7,

docs/kcl/patternTransform.md

@@ -63,7 +63,7 @@ fn transform(id) {
 // Sketch 4 cylinders.
 sketch001 = startSketchOn('XZ')
   |> circle({ center = [0, 0], radius = 2 }, %)
-  |> extrude(length = 5)
+  |> extrude(5, %)
   |> patternTransform(4, transform, %)
 ```
 
@@ -79,7 +79,7 @@ fn transform(id) {
 
 sketch001 = startSketchOn('XZ')
   |> circle({ center = [0, 0], radius = 2 }, %)
-  |> extrude(length = 5)
+  |> extrude(5, %)
   |> patternTransform(4, transform, %)
 ```
 
@@ -97,12 +97,12 @@ fn cube(length, center) {
 
   return startSketchOn('XY')
     |> startProfileAt(p0, %)
-    |> line(endAbsolute = p1)
-    |> line(endAbsolute = p2)
-    |> line(endAbsolute = p3)
-    |> line(endAbsolute = p0)
-    |> close()
-    |> extrude(length = length)
+    |> lineTo(p1, %)
+    |> lineTo(p2, %)
+    |> lineTo(p3, %)
+    |> lineTo(p0, %)
+    |> close(%)
+    |> extrude(length, %)
 }
 
 width = 20
@@ -135,12 +135,12 @@ fn cube(length, center) {
 
   return startSketchOn('XY')
     |> startProfileAt(p0, %)
-    |> line(endAbsolute = p1)
-    |> line(endAbsolute = p2)
-    |> line(endAbsolute = p3)
-    |> line(endAbsolute = p0)
-    |> close()
-    |> extrude(length = length)
+    |> lineTo(p1, %)
+    |> lineTo(p2, %)
+    |> lineTo(p3, %)
+    |> lineTo(p0, %)
+    |> close(%)
+    |> extrude(length, %)
 }
 
 width = 20
@@ -179,7 +179,7 @@ fn layer() {
   return startSketchOn("XY")
     // or some other plane idk
     |> circle({ center = [0, 0], radius = 1 }, %, $tag1)
-    |> extrude(length = h)
+    |> extrude(h, %)
 }
 // The vase is 100 layers tall.
 // The 100 layers are replica of each other, with a slight transformation applied to each.
@@ -205,7 +205,7 @@ startSketchOn('XY')
        center = [0, 0],
        inscribed = false
      }, %)
-  |> extrude(length = 4)
+  |> extrude(4, %)
   |> patternTransform(3, transform, %)
 ```
 

docs/kcl/segEnd.md

@@ -30,12 +30,12 @@ segEnd(tag: TagIdentifier) -> [number]
 w = 15
 cube = startSketchOn('XY')
   |> startProfileAt([0, 0], %)
-  |> line(end = [w, 0], tag = $line1)
-  |> line(end = [0, w], tag = $line2)
-  |> line(end = [-w, 0], tag = $line3)
-  |> line(end = [0, -w], tag = $line4)
-  |> close()
-  |> extrude(length = 5)
+  |> line([w, 0], %, $line1)
+  |> line([0, w], %, $line2)
+  |> line([-w, 0], %, $line3)
+  |> line([0, -w], %, $line4)
+  |> close(%)
+  |> extrude(5, %)
 
 fn cylinder(radius, tag) {
   return startSketchOn('XY')
@@ -44,7 +44,7 @@ fn cylinder(radius, tag) {
          radius = radius,
          center = segEnd(tag)
        }, %)
-    |> extrude(length = radius)
+    |> extrude(radius, %)
 }
 
 cylinder(1, line1)

docs/kcl/segStart.md

@@ -30,12 +30,12 @@ segStart(tag: TagIdentifier) -> [number]
 w = 15
 cube = startSketchOn('XY')
   |> startProfileAt([0, 0], %)
-  |> line(end = [w, 0], tag = $line1)
-  |> line(end = [0, w], tag = $line2)
-  |> line(end = [-w, 0], tag = $line3)
-  |> line(end = [0, -w], tag = $line4)
-  |> close()
-  |> extrude(length = 5)
+  |> line([w, 0], %, $line1)
+  |> line([0, w], %, $line2)
+  |> line([-w, 0], %, $line3)
+  |> line([0, -w], %, $line4)
+  |> close(%)
+  |> extrude(5, %)
 
 fn cylinder(radius, tag) {
   return startSketchOn('XY')
@@ -44,7 +44,7 @@ fn cylinder(radius, tag) {
          radius = radius,
          center = segStart(tag)
        }, %)
-    |> extrude(length = radius)
+    |> extrude(radius, %)
 }
 
 cylinder(1, line1)

docs/kcl/shell.md

@@ -31,11 +31,11 @@ shell(data: ShellData, solid_set: SolidSet) -> SolidSet
 // Remove the end face for the extrusion.
 firstSketch = startSketchOn('XY')
   |> startProfileAt([-12, 12], %)
-  |> line(end = [24, 0])
-  |> line(end = [0, -24])
-  |> line(end = [-24, 0])
-  |> close()
-  |> extrude(length = 6)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
 
 // Remove the end face for the extrusion.
 shell({ faces = ['end'], thickness = 0.25 }, firstSketch)
@@ -47,11 +47,11 @@ shell({ faces = ['end'], thickness = 0.25 }, firstSketch)
 // Remove the start face for the extrusion.
 firstSketch = startSketchOn('-XZ')
   |> startProfileAt([-12, 12], %)
-  |> line(end = [24, 0])
-  |> line(end = [0, -24])
-  |> line(end = [-24, 0])
-  |> close()
-  |> extrude(length = 6)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
 
 // Remove the start face for the extrusion.
 shell({ faces = ['start'], thickness = 0.25 }, firstSketch)
@@ -63,11 +63,11 @@ shell({ faces = ['start'], thickness = 0.25 }, firstSketch)
 // Remove a tagged face and the end face for the extrusion.
 firstSketch = startSketchOn('XY')
   |> startProfileAt([-12, 12], %)
-  |> line(end = [24, 0])
-  |> line(end = [0, -24])
-  |> line(end = [-24, 0], tag = $myTag)
-  |> close()
-  |> extrude(length = 6)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %, $myTag)
+  |> close(%)
+  |> extrude(6, %)
 
 // Remove a tagged face for the extrusion.
 shell({ faces = [myTag], thickness = 0.25 }, firstSketch)
@@ -79,11 +79,11 @@ shell({ faces = [myTag], thickness = 0.25 }, firstSketch)
 // Remove multiple faces at once.
 firstSketch = startSketchOn('XY')
   |> startProfileAt([-12, 12], %)
-  |> line(end = [24, 0])
-  |> line(end = [0, -24])
-  |> line(end = [-24, 0], tag = $myTag)
-  |> close()
-  |> extrude(length = 6)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %, $myTag)
+  |> close(%)
+  |> extrude(6, %)
 
 // Remove a tagged face and the end face for the extrusion.
 shell({
@@ -99,25 +99,25 @@ shell({
 size = 100
 case = startSketchOn('-XZ')
   |> startProfileAt([-size, -size], %)
-  |> line(end = [2 * size, 0])
-  |> line(end = [0, 2 * size])
+  |> line([2 * size, 0], %)
+  |> line([0, 2 * size], %)
   |> tangentialArcTo([-size, size], %)
-  |> close()
-  |> extrude(length = 65)
+  |> close(%)
+  |> extrude(65, %)
 
 thing1 = startSketchOn(case, 'end')
   |> circle({
        center = [-size / 2, -size / 2],
        radius = 25
      }, %)
-  |> extrude(length = 50)
+  |> extrude(50, %)
 
 thing2 = startSketchOn(case, 'end')
   |> circle({
        center = [size / 2, -size / 2],
        radius = 25
      }, %)
-  |> extrude(length = 50)
+  |> extrude(50, %)
 
 // We put "case" in the shell function to shell the entire object.
 shell({ faces = ['start'], thickness = 5 }, case)
@@ -130,25 +130,25 @@ shell({ faces = ['start'], thickness = 5 }, case)
 size = 100
 case = startSketchOn('XY')
   |> startProfileAt([-size, -size], %)
-  |> line(end = [2 * size, 0])
-  |> line(end = [0, 2 * size])
+  |> line([2 * size, 0], %)
+  |> line([0, 2 * size], %)
   |> tangentialArcTo([-size, size], %)
-  |> close()
-  |> extrude(length = 65)
+  |> close(%)
+  |> extrude(65, %)
 
 thing1 = startSketchOn(case, 'end')
   |> circle({
        center = [-size / 2, -size / 2],
        radius = 25
      }, %)
-  |> extrude(length = 50)
+  |> extrude(50, %)
 
 thing2 = startSketchOn(case, 'end')
   |> circle({
        center = [size / 2, -size / 2],
        radius = 25
      }, %)
-  |> extrude(length = 50)
+  |> extrude(50, %)
 
 // We put "thing1" in the shell function to shell the end face of the object.
 shell({ faces = ['end'], thickness = 5 }, thing1)
@@ -164,25 +164,25 @@ shell({ faces = ['end'], thickness = 5 }, thing1)
 size = 100
 case = startSketchOn('XY')
   |> startProfileAt([-size, -size], %)
-  |> line(end = [2 * size, 0])
-  |> line(end = [0, 2 * size])
+  |> line([2 * size, 0], %)
+  |> line([0, 2 * size], %)
   |> tangentialArcTo([-size, size], %)
-  |> close()
-  |> extrude(length = 65)
+  |> close(%)
+  |> extrude(65, %)
 
 thing1 = startSketchOn(case, 'end')
   |> circle({
        center = [-size / 2, -size / 2],
        radius = 25
      }, %)
-  |> extrude(length = 50)
+  |> extrude(50, %)
 
 thing2 = startSketchOn(case, 'end')
   |> circle({
        center = [size / 2, -size / 2],
        radius = 25
      }, %)
-  |> extrude(length = 50)
+  |> extrude(50, %)
 
 // We put "thing1" and "thing2" in the shell function to shell the end face of the object.
 shell({ faces = ['end'], thickness = 5 }, [thing1, thing2])

docs/kcl/sweep.md

@@ -34,11 +34,11 @@ sweep(data: SweepData, sketch: Sketch) -> Solid
 // Create a path for the sweep.
 sweepPath = startSketchOn('XZ')
   |> startProfileAt([0.05, 0.05], %)
-  |> line(end = [0, 7])
+  |> line([0, 7], %)
   |> tangentialArc({ offset = 90, radius = 5 }, %)
-  |> line(end = [-3, 0])
+  |> line([-3, 0], %)
   |> tangentialArc({ offset = -90, radius = 5 }, %)
-  |> line(end = [0, 7])
+  |> line([0, 7], %)
 
 // Create a hole for the pipe.
 pipeHole = startSketchOn('XY')

e2e/playwright/code-pane-and-errors.spec.ts

@@ -20,11 +20,11 @@ test.describe('Code pane and errors', () => {
         `// Extruded Triangle
   sketch001 = startSketchOn('XZ')
     |> startProfileAt([0, 0], %)
-    |> line(end = [10, 0])
-    |> line(end = [-5, 10])
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()
-  extrude001 = extrude(sketch001, length = 5)`
+    |> line([10, 0], %)
+    |> line([-5, 10], %)
+    |> lineTo([profileStartX(%), profileStartY(%)], %)
+    |> close(%)
+  extrude001 = extrude(5, sketch001)`
       )
     })
 
@@ -79,10 +79,8 @@ test.describe('Code pane and errors', () => {
 
     // Delete a character to break the KCL
     await editor.openPane()
-    await editor.scrollToText('bracketLeg1Sketch, length = thickness)')
-    await page
-      .getByText('extrude(bracketLeg1Sketch, length = thickness)')
-      .click()
+    await editor.scrollToText('thickness, bracketLeg1Sketch)')
+    await page.getByText('extrude(thickness, bracketLeg1Sketch)').click()
     await page.keyboard.press('Backspace')
 
     // Ensure that a badge appears on the button
@@ -109,7 +107,7 @@ test.describe('Code pane and errors', () => {
     await editor.openPane()
 
     // Go to our problematic code again (missing closing paren!)
-    await editor.scrollToText('extrude(bracketLeg1Sketch, length = thickness')
+    await editor.scrollToText('extrude(thickness, bracketLeg1Sketch')
 
     // Ensure that a badge appears on the button
     await expect(codePaneButtonHolder).toContainText('notification')

e2e/playwright/command-bar-tests.spec.ts

@@ -1,8 +1,7 @@
 import { test, expect } from './zoo-test'
-import * as fsp from 'fs/promises'
-import { executorInputPath, getUtils } from './test-utils'
+
+import { getUtils } from './test-utils'
 import { KCL_DEFAULT_LENGTH } from 'lib/constants'
-import path from 'path'
 
 test.describe('Command bar tests', () => {
   test('Extrude from command bar selects extrude line after', async ({
@@ -14,10 +13,10 @@ test.describe('Command bar tests', () => {
         'persistCode',
         `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
+  |> line([20, 0], %)
+  |> line([0, 20], %)
   |> xLine(-20, %)
-  |> close()
+  |> close(%)
     `
       )
     })
@@ -32,7 +31,7 @@ test.describe('Command bar tests', () => {
     await u.closeDebugPanel()
 
     // Click the line of code for xLine.
-    await page.getByText(`close()`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
+    await page.getByText(`close(%)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
     await page.waitForTimeout(100)
 
     await page.getByRole('button', { name: 'Extrude' }).click()
@@ -42,47 +41,7 @@ test.describe('Command bar tests', () => {
     await page.keyboard.press('Enter')
     await page.waitForTimeout(200)
     await expect(page.locator('.cm-activeLine')).toHaveText(
-      `extrude001 = extrude(sketch001, length = ${KCL_DEFAULT_LENGTH})`
-    )
-  })
-
-  // TODO: fix this test after the electron migration
-  test.fixme('Fillet from command bar', async ({ page, homePage }) => {
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `sketch001 = startSketchOn('XY')
-    |> startProfileAt([-5, -5], %)
-    |> line(end = [0, 10])
-    |> line(end = [10, 0])
-    |> line(end = [0, -10])
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()
-  extrude001 = extrude(sketch001, length = -10)`
-      )
-    })
-
-    const u = await getUtils(page)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await homePage.goToModelingScene()
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    const selectSegment = () => page.getByText(`line(end = [0, -10])`).click()
-
-    await selectSegment()
-    await page.waitForTimeout(100)
-    await page.getByRole('button', { name: 'Fillet' }).click()
-    await page.waitForTimeout(100)
-    await page.keyboard.press('Enter') // skip selection
-    await page.waitForTimeout(100)
-    await page.keyboard.press('Enter') // accept default radius
-    await page.waitForTimeout(100)
-    await page.keyboard.press('Enter') // submit
-    await page.waitForTimeout(100)
-    await expect(page.locator('.cm-activeLine')).toContainText(
-      `fillet({ radius = ${KCL_DEFAULT_LENGTH}, tags = [seg01] }, %)`
+      `extrude001 = extrude(${KCL_DEFAULT_LENGTH}, sketch001)`
     )
   })
 
@@ -223,10 +182,10 @@ test.describe('Command bar tests', () => {
         `distance = sqrt(20)
     sketch001 = startSketchOn('XZ')
     |> startProfileAt([-6.95, 10.98], %)
-    |> line(end = [25.1, 0.41])
-    |> line(end = [0.73, -20.93])
-    |> line(end = [-23.44, 0.52])
-    |> close()
+    |> line([25.1, 0.41], %)
+    |> line([0.73, -20.93], %)
+    |> line([-23.44, 0.52], %)
+    |> close(%)
         `
       )
     })
@@ -291,7 +250,7 @@ test.describe('Command bar tests', () => {
     await u.waitForCmdReceive('extrude')
 
     await expect(page.locator('.cm-content')).toContainText(
-      'extrude001 = extrude(sketch001, length = distance001)'
+      'extrude001 = extrude(distance001, sketch001)'
     )
   })
 
@@ -346,132 +305,4 @@ test.describe('Command bar tests', () => {
     await arcToolCommand.click()
     await expect(arcToolButton).toHaveAttribute('aria-pressed', 'true')
   })
-
-  test(`Reacts to query param to open "import from URL" command`, async ({
-    page,
-    cmdBar,
-    editor,
-    homePage,
-  }) => {
-    await test.step(`Prepare and navigate to home page with query params`, async () => {
-      const targetURL = `?create-file&name=test&units=mm&code=ZXh0cnVzaW9uRGlzdGFuY2UgPSAxMg%3D%3D&ask-open-desktop`
-      await homePage.expectState({
-        projectCards: [],
-        sortBy: 'last-modified-desc',
-      })
-      await page.goto(page.url() + targetURL)
-      expect(page.url()).toContain(targetURL)
-    })
-
-    await test.step(`Submit the command`, async () => {
-      await cmdBar.expectState({
-        stage: 'arguments',
-        commandName: 'Import file from URL',
-        currentArgKey: 'method',
-        currentArgValue: '',
-        headerArguments: {
-          Method: '',
-          Name: 'test',
-          Code: '1 line',
-        },
-        highlightedHeaderArg: 'method',
-      })
-      await cmdBar.selectOption({ name: 'New Project' }).click()
-      await cmdBar.expectState({
-        stage: 'review',
-        commandName: 'Import file from URL',
-        headerArguments: {
-          Method: 'New project',
-          Name: 'test',
-          Code: '1 line',
-        },
-      })
-      await cmdBar.progressCmdBar()
-    })
-
-    await test.step(`Ensure we created the project and are in the modeling scene`, async () => {
-      await editor.expectEditor.toContain('extrusionDistance = 12')
-    })
-  })
-
-  test(`"import from URL" can add to existing project`, async ({
-    page,
-    cmdBar,
-    editor,
-    homePage,
-    toolbar,
-    context,
-  }) => {
-    await context.folderSetupFn(async (dir) => {
-      const testProjectDir = path.join(dir, 'testProjectDir')
-      await Promise.all([fsp.mkdir(testProjectDir, { recursive: true })])
-      await Promise.all([
-        fsp.copyFile(
-          executorInputPath('cylinder.kcl'),
-          path.join(testProjectDir, 'main.kcl')
-        ),
-      ])
-    })
-    await test.step(`Prepare and navigate to home page with query params`, async () => {
-      const targetURL = `?create-file&name=test&units=mm&code=ZXh0cnVzaW9uRGlzdGFuY2UgPSAxMg%3D%3D&ask-open-desktop`
-      await homePage.expectState({
-        projectCards: [
-          {
-            fileCount: 1,
-            title: 'testProjectDir',
-          },
-        ],
-        sortBy: 'last-modified-desc',
-      })
-      await page.goto(page.url() + targetURL)
-      expect(page.url()).toContain(targetURL)
-    })
-
-    await test.step(`Submit the command`, async () => {
-      await cmdBar.expectState({
-        stage: 'arguments',
-        commandName: 'Import file from URL',
-        currentArgKey: 'method',
-        currentArgValue: '',
-        headerArguments: {
-          Method: '',
-          Name: 'test',
-          Code: '1 line',
-        },
-        highlightedHeaderArg: 'method',
-      })
-      await cmdBar.selectOption({ name: 'Existing Project' }).click()
-      await cmdBar.expectState({
-        stage: 'arguments',
-        commandName: 'Import file from URL',
-        currentArgKey: 'projectName',
-        currentArgValue: '',
-        headerArguments: {
-          Method: 'Existing project',
-          Name: 'test',
-          ProjectName: '',
-          Code: '1 line',
-        },
-        highlightedHeaderArg: 'projectName',
-      })
-      await cmdBar.selectOption({ name: 'testProjectDir' }).click()
-      await cmdBar.expectState({
-        stage: 'review',
-        commandName: 'Import file from URL',
-        headerArguments: {
-          Method: 'Existing project',
-          ProjectName: 'testProjectDir',
-          Name: 'test',
-          Code: '1 line',
-        },
-      })
-      await cmdBar.progressCmdBar()
-    })
-
-    await test.step(`Ensure we created the project and are in the modeling scene`, async () => {
-      await editor.expectEditor.toContain('extrusionDistance = 12')
-      await toolbar.openPane('files')
-      await toolbar.expectFileTreeState(['main.kcl', 'test.kcl'])
-    })
-  })
 })

e2e/playwright/copilot-ghost-test.spec.ts

@@ -20,7 +20,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -29,7 +29,7 @@ test.describe('Copilot ghost text', () => {
     // We should be able to hit Tab to accept the completion.
     await page.keyboard.press('Tab')
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
 
     // Hit enter a few times.
@@ -37,7 +37,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
 
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)    `
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)    `
     )
 
     await expect(page.locator('.cm-ghostText')).not.toBeVisible()
@@ -80,7 +80,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
 
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -89,7 +89,7 @@ test.describe('Copilot ghost text', () => {
     // We should be able to hit Tab to accept the completion.
     await page.keyboard.press('Tab')
     await expect(page.locator('.cm-content')).toContainText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
   })
 
@@ -156,7 +156,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
 
     await expect(page.locator('.cm-content')).toHaveText(
-      `sketch001 = startSketchOn('XZ')fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `sketch001 = startSketchOn('XZ')fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -165,7 +165,7 @@ test.describe('Copilot ghost text', () => {
     // We should be able to hit Tab to accept the completion.
     await page.keyboard.press('Tab')
     await expect(page.locator('.cm-content')).toHaveText(
-      `sketch001 = startSketchOn('XZ')fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `sketch001 = startSketchOn('XZ')fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
 
     // Hit enter a few times.
@@ -173,7 +173,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
 
     await expect(page.locator('.cm-content')).toHaveText(
-      `sketch001 = startSketchOn('XZ')fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)    `
+      `sketch001 = startSketchOn('XZ')fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)    `
     )
 
     await expect(page.locator('.cm-ghostText')).not.toBeVisible()
@@ -194,7 +194,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -225,7 +225,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -256,7 +256,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -287,7 +287,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -315,7 +315,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -326,7 +326,7 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
 
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
   })
 
@@ -348,7 +348,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
     await expect(page.locator('.cm-content')).toHaveText(
-      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -409,7 +409,7 @@ test.describe('Copilot ghost text', () => {
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
     await expect(page.locator('.cm-content')).toHaveText(
-      `{thing: "blah"}fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+      `{thing: "blah"}fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
     )
     await expect(page.locator('.cm-ghostText').first()).toHaveText(
       `fn cube = (pos, scale) => {`
@@ -450,7 +450,7 @@ test.describe('Copilot ghost text', () => {
       await page.keyboard.press('Enter')
       await expect(page.locator('.cm-ghostText').first()).toBeVisible()
       await expect(page.locator('.cm-content')).toHaveText(
-        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
       )
       await expect(page.locator('.cm-ghostText').first()).toHaveText(
         `fn cube = (pos, scale) => {`
@@ -483,7 +483,7 @@ test.describe('Copilot ghost text', () => {
       await page.keyboard.press('Enter')
       await expect(page.locator('.cm-ghostText').first()).toBeVisible()
       await expect(page.locator('.cm-content')).toHaveText(
-        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
       )
       await expect(page.locator('.cm-ghostText').first()).toHaveText(
         `fn cube = (pos, scale) => {`
@@ -514,7 +514,7 @@ test.describe('Copilot ghost text', () => {
       await page.keyboard.press('Enter')
       await expect(page.locator('.cm-ghostText').first()).toBeVisible()
       await expect(page.locator('.cm-content')).toHaveText(
-        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line(end = [0, scale], %)    |> line(end = [scale, 0])    |> line(end = [0, -scale])  return sg}part001 = cube([0,0], 20)    |> close()    |> extrude(length = 20)`
+        `fn cube = (pos, scale) => {  sg = startSketchOn('XY')    |> startProfileAt(pos, %)    |> line([0, scale], %)    |> line([scale, 0], %)    |> line([0, -scale], %)  return sg}part001 = cube([0,0], 20)    |> close(%)    |> extrude(20, %)`
       )
       await expect(page.locator('.cm-ghostText').first()).toHaveText(
         `fn cube = (pos, scale) => {`

e2e/playwright/debug-pane.spec.ts

@@ -20,7 +20,7 @@ test.describe('Debug pane', () => {
   }) => {
     const code = `sketch001 = startSketchOn('XZ')
     |> startProfileAt([0, 0], %)
-  |> line(end = [1, 1])
+  |> line([1, 1], %)
   `
     const u = await getUtils(page)
     await page.setBodyDimensions({ width: 1200, height: 500 })
@@ -61,7 +61,7 @@ test.describe('Debug pane', () => {
       }
     })
     await test.step('Enter a comment', async () => {
-      await page.keyboard.type('|> line(end = [2, 2])', { delay: 0 })
+      await page.keyboard.type('|> line([2, 2], %)', { delay: 0 })
       // Wait for keyboard input debounce and updated artifact graph.
       await page.waitForTimeout(1000)
     })

e2e/playwright/editor-tests.spec.ts

@@ -23,10 +23,10 @@ test.describe('Editor tests', () => {
     await u.codeLocator.click()
     await page.keyboard.type(`sketch001 = startSketchOn('XY')
     |> startProfileAt([-10, -10], %)
-    |> line(end = [20, 0])
-    |> line(end = [0, 20])
-    |> line(end = [-20, 0])
-    |> close()`)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
 
     await page.keyboard.down('ControlOrMeta')
     await page.keyboard.press('/')
@@ -35,10 +35,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
-  |> line(end = [-20, 0])
-  // |> close()`)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  // |> close(%)`)
 
     // uncomment the code
     await page.keyboard.down('ControlOrMeta')
@@ -48,10 +48,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
-  |> line(end = [-20, 0])
-  |> close()`)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
   })
 
   test('ensure we use the cache, and do not re-execute', async ({
@@ -67,10 +67,10 @@ test.describe('Editor tests', () => {
     await u.codeLocator.click()
     await page.keyboard.type(`sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
-  |> line(end = [-20, 0])
-  |> close()`)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
 
     // Ensure we execute the first time.
     await u.openDebugPanel()
@@ -116,10 +116,10 @@ test.describe('Editor tests', () => {
     await u.codeLocator.click()
     await page.keyboard.type(`sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
-  |> line(end = [-20, 0])
-  |> close()`)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
 
     // Ensure we execute the first time.
     await u.openDebugPanel()
@@ -171,20 +171,20 @@ test.describe('Editor tests', () => {
     await u.codeLocator.click()
     await page.keyboard.type(`sketch001 = startSketchOn('XY')
     |> startProfileAt([-10, -10], %)
-    |> line(end = [20, 0])
-    |> line(end = [0, 20])
-    |> line(end = [-20, 0])
-    |> close()`)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
     await page.locator('#code-pane button:first-child').click()
     await page.locator('button:has-text("Format code")').click()
 
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
-  |> line(end = [-20, 0])
-  |> close()`)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
   })
 
   test('if you click the format button it formats your code and executes so lints are still there', async ({
@@ -202,10 +202,10 @@ test.describe('Editor tests', () => {
     await u.codeLocator.click()
     await page.keyboard.type(`sketch_001 = startSketchOn('XY')
     |> startProfileAt([-10, -10], %)
-    |> line(end = [20, 0])
-    |> line(end = [0, 20])
-    |> line(end = [-20, 0])
-    |> close()`)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
 
     await u.openDebugPanel()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -230,10 +230,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch_001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
-  |> line(end = [-20, 0])
-  |> close()`)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
@@ -248,19 +248,19 @@ test.describe('Editor tests', () => {
   test('fold gutters work', async ({ page, homePage }) => {
     const fullCode = `sketch001 = startSketchOn('XY')
    |> startProfileAt([-10, -10], %)
-   |> line(end = [20, 0])
-   |> line(end = [0, 20])
-   |> line(end = [-20, 0])
-   |> close()`
+   |> line([20, 0], %)
+   |> line([0, 20], %)
+   |> line([-20, 0], %)
+   |> close(%)`
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XY')
    |> startProfileAt([-10, -10], %)
-   |> line(end = [20, 0])
-   |> line(end = [0, 20])
-   |> line(end = [-20, 0])
-   |> close()`
+   |> line([20, 0], %)
+   |> line([0, 20], %)
+   |> line([-20, 0], %)
+   |> close(%)`
       )
     })
     await page.setBodyDimensions({ width: 1000, height: 500 })
@@ -326,10 +326,10 @@ test.describe('Editor tests', () => {
         'persistCode',
         `sketch001 = startSketchOn('XY')
     |> startProfileAt([-10, -10], %)
-    |> line(end = [20, 0])
-    |> line(end = [0, 20])
-    |> line(end = [-20, 0])
-    |> close()`
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`
       )
     })
     await page.setBodyDimensions({ width: 1000, height: 500 })
@@ -358,9 +358,7 @@ test.describe('Editor tests', () => {
     // Hover over the line function
     await page.getByText('line').first().hover()
     await expect(page.locator('.hover-tooltip')).toBeVisible()
-    await expect(
-      page.getByText('Extend the current sketch with a new straight line.')
-    ).toBeVisible()
+    await expect(page.getByText('Draw a line')).toBeVisible()
   })
 
   test('if you use the format keyboard binding it formats your code', async ({
@@ -373,10 +371,10 @@ test.describe('Editor tests', () => {
         'persistCode',
         `sketch001 = startSketchOn('XY')
     |> startProfileAt([-10, -10], %)
-    |> line(end = [20, 0])
-    |> line(end = [0, 20])
-    |> line(end = [-20, 0])
-    |> close()`
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`
       )
       localStorage.setItem('disableAxis', 'true')
     })
@@ -400,10 +398,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
-  |> line(end = [-20, 0])
-  |> close()`)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
   })
 
   test('if you use the format keyboard binding it formats your code and executes so lints are shown', async ({
@@ -416,10 +414,10 @@ test.describe('Editor tests', () => {
         'persistCode',
         `sketch_001 = startSketchOn('XY')
     |> startProfileAt([-10, -10], %)
-    |> line(end = [20, 0])
-    |> line(end = [0, 20])
-    |> line(end = [-20, 0])
-    |> close()`
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`
       )
       localStorage.setItem('disableAxis', 'true')
     })
@@ -453,10 +451,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch_001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
-  |> line(end = [20, 0])
-  |> line(end = [0, 20])
-  |> line(end = [-20, 0])
-  |> close()`)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
@@ -521,9 +519,9 @@ test.describe('Editor tests', () => {
         'persistCode',
         `sketch001 = startSketchOn('XZ')
     |> startProfileAt([3.29, 7.86], %)
-    |> line(end = [2.48, 2.44])
-    |> line(end = [2.66, 1.17])
-    |> close()
+    |> line([2.48, 2.44], %)
+    |> line([2.66, 1.17], %)
+    |> close(%)
     `
       )
     })
@@ -537,7 +535,7 @@ test.describe('Editor tests', () => {
 
     await u.codeLocator.click()
 
-    await page.getByText(' |> line(end = [2.48, 2.44])').click()
+    await page.getByText(' |> line([2.48, 2.44], %)').click()
 
     await expect(
       page.locator('.cm-lint-marker-error').first()
@@ -645,10 +643,10 @@ test.describe('Editor tests', () => {
     fn squareHole = (l, w) => {
   squareHoleSketch = startSketchOn('XY')
   |> startProfileAt([-width / 2, -length / 2], %)
-  |> line(endAbsolute = [width / 2, -length / 2])
-  |> line(endAbsolute = [width / 2, length / 2])
-  |> line(endAbsolute = [-width / 2, length / 2])
-  |> close()
+  |> lineTo([width / 2, -length / 2], %)
+  |> lineTo([width / 2, length / 2], %)
+  |> lineTo([-width / 2, length / 2], %)
+  |> close(%)
   return squareHoleSketch
     }
     `
@@ -686,7 +684,7 @@ test.describe('Editor tests', () => {
       await page.keyboard.type(`extrusion = startSketchOn('XY')
   |> circle({ center: [0, 0], radius: dia/2 }, %)
     |> hole(squareHole(length, width, height), %)
-    |> extrude(length = height)`)
+    |> extrude(height, %)`)
 
       // error in gutter
       await expect(page.locator('.cm-lint-marker-error').first()).toBeVisible()
@@ -709,18 +707,18 @@ test.describe('Editor tests', () => {
         'persistCode',
         `box = startSketchOn('XY')
     |> startProfileAt([0, 0], %)
-    |> line(end = [0, 10])
-    |> line(end = [10, 0])
-    |> line(end = [0, -10], tag = $revolveAxis)
-    |> close()
-    |> extrude(length = 10)
+    |> line([0, 10], %)
+    |> line([10, 0], %)
+    |> line([0, -10], %, $revolveAxis)
+    |> close(%)
+    |> extrude(10, %)
   
     sketch001 = startSketchOn(box, revolveAxis)
     |> startProfileAt([5, 10], %)
-    |> line(end = [0, -10])
-    |> line(end = [2, 0])
-    |> line(end = [0, -10])
-    |> close()
+    |> line([0, -10], %)
+    |> line([2, 0], %)
+    |> line([0, -10], %)
+    |> close(%)
     |> revolve({
     axis: revolveAxis,
     angle: 90
@@ -791,7 +789,8 @@ test.describe('Editor tests', () => {
 
       await expect(page.locator('.cm-tooltip-autocomplete')).toBeVisible()
       await page.waitForTimeout(100)
-      // press arrow down then enter to accept xLine
+      // press arrow down twice then enter to accept xLine
+      await page.keyboard.press('ArrowDown')
       await page.keyboard.press('ArrowDown')
       await page.keyboard.press('Enter')
       // finish line with comment
@@ -864,7 +863,8 @@ test.describe('Editor tests', () => {
 
       await expect(page.locator('.cm-tooltip-autocomplete')).toBeVisible()
       await page.waitForTimeout(100)
-      // press arrow down then tab to accept xLine
+      // press arrow down twice then tab to accept xLine
+      await page.keyboard.press('ArrowDown')
       await page.keyboard.press('ArrowDown')
       await page.keyboard.press('Tab')
       // finish line with comment
@@ -899,9 +899,9 @@ test.describe('Editor tests', () => {
         'persistCode',
         `sketch001 = startSketchOn('XZ')
   |> startProfileAt([4.61, -14.01], %)
-  |> line(end = [12.73, -0.09])
+  |> line([12.73, -0.09], %)
   |> tangentialArcTo([24.95, -5.38], %)
-  |> close()`
+  |> close(%)`
       )
     })
 
@@ -949,7 +949,7 @@ test.describe('Editor tests', () => {
 
     // expect the code to have changed
     await expect(page.locator('.cm-content')).toHaveText(
-      `sketch001 = startSketchOn('XZ')  |> startProfileAt([4.61, -14.01], %)  |> line(end = [12.73, -0.09])  |> tangentialArcTo([24.95, -5.38], %)  |> close()extrude001 = extrude(sketch001, length = 5)`
+      `sketch001 = startSketchOn('XZ')  |> startProfileAt([4.61, -14.01], %)  |> line([12.73, -0.09], %)  |> tangentialArcTo([24.95, -5.38], %)  |> close(%)extrude001 = extrude(5, sketch001)`
     )
 
     // Now hit undo
@@ -961,9 +961,9 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
   |> startProfileAt([4.61, -14.01], %)
-  |> line(end = [12.73, -0.09])
+  |> line([12.73, -0.09], %)
   |> tangentialArcTo([24.95, -5.38], %)
-  |> close()`)
+  |> close(%)`)
   })
 
   test('Can undo a sketch modification with ctrl+z', async ({
@@ -976,10 +976,10 @@ test.describe('Editor tests', () => {
         'persistCode',
         `sketch001 = startSketchOn('XZ')
   |> startProfileAt([4.61, -10.01], %)
-  |> line(end = [12.73, -0.09])
+  |> line([12.73, -0.09], %)
   |> tangentialArcTo([24.95, -0.38], %)
-  |> close()
-  |> extrude(length = 5)`
+  |> close(%)
+  |> extrude(5, %)`
       )
     })
 
@@ -1067,10 +1067,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt([2.71, -2.71], %)
-    |> line(end = [15.4, -2.78])
+    |> line([15.4, -2.78], %)
     |> tangentialArcTo([27.6, -3.05], %)
-    |> close()
-    |> extrude(length = 5)
+    |> close(%)
+    |> extrude(5, %)
   `)
 
     // Hit undo
@@ -1081,10 +1081,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt([2.71, -2.71], %)
-    |> line(end = [15.4, -2.78])
+    |> line([15.4, -2.78], %)
     |> tangentialArcTo([24.95, -0.38], %)
-    |> close()
-    |> extrude(length = 5)`)
+    |> close(%)
+    |> extrude(5, %)`)
 
     // Hit undo again.
     await page.keyboard.down('Control')
@@ -1094,10 +1094,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt([2.71, -2.71], %)
-    |> line(end = [12.73, -0.09])
+    |> line([12.73, -0.09], %)
     |> tangentialArcTo([24.95, -0.38], %)
-    |> close()
-    |> extrude(length = 5)
+    |> close(%)
+    |> extrude(5, %)
   `)
 
     // Hit undo again.
@@ -1109,10 +1109,10 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
   |> startProfileAt([4.61, -10.01], %)
-  |> line(end = [12.73, -0.09])
+  |> line([12.73, -0.09], %)
   |> tangentialArcTo([24.95, -0.38], %)
-  |> close()
-  |> extrude(length = 5)`)
+  |> close(%)
+  |> extrude(5, %)`)
   })
 
   test.fixme(

e2e/playwright/feature-tree-pane.spec.ts

@@ -9,30 +9,30 @@ export fn triangle() {
   return startSketchOn('XZ')
     |> startProfileAt([0, 0], %)
     |> xLine(10, %)
-    |> line(end = [-10, -5])
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()
+    |> line([-10, -5], %)
+    |> lineTo([profileStartX(%), profileStartY(%)], %)
+    |> close(%)
 }
 
 length001 = timesFive(1) * 5
 sketch001 = startSketchOn('XZ')
   |> startProfileAt([20, 10], %)
-  |> line(end = [10, 10])
+  |> line([10, 10], %)
   |> angledLine([-45, length001], %)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
 revolve001 = revolve({ axis = "X" }, sketch001)
 triangle()
-  |> extrude(length = 30)
+  |> extrude(30, %)
 plane001 = offsetPlane('XY', 10)
 sketch002 = startSketchOn(plane001)
   |> startProfileAt([-20, 0], %)
-  |> line(end = [5, -15])
+  |> line([5, -15], %)
   |> xLine(-10, %)
-  |> line(endAbsolute = [-40, 0])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-extrude001 = extrude(sketch002, length = 10)
+  |> lineTo([-40, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude001 = extrude(10, sketch002)
 `
 
 test.describe('Feature Tree pane', () => {
@@ -97,7 +97,7 @@ test.describe('Feature Tree pane', () => {
       await testViewSource({
         operationName: 'Extrude',
         operationIndex: 1,
-        expectedActiveLine: 'extrude001 = extrude(sketch002, length = 10)',
+        expectedActiveLine: 'extrude001 = extrude(10, sketch002)',
       })
       await testViewSource({
         operationName: 'Revolve',