ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow users to delete sketches on offset planes via feature tree (#5641)

Browse Source 
* Add sketch-on-offset plane deletion cleanup logic

* Add an E2E test for this behavior
This commit is contained in:
Frank Noirot
2025-03-05 17:56:28 -05:00
committed by GitHub
parent e500fad0e1
commit c13bdbb749
2 changed files with 98 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/lang/modifyAst.ts
View File

@ -75,6 +75,7 @@ import {
import { BodyItem } from '@rust/kcl-lib/bindings/BodyItem'
import { findKwArg } from './util'
import { deleteEdgeTreatment } from './modifyAst/addEdgeTreatment'
import { codeManager } from 'lib/singletons'
export function startSketchOnDefault(
node: Node<Program>,
@ -1409,18 +1410,39 @@ export async function deleteFromSelection(
({} as any)
): Promise<Node<Program> | Error> {
const astClone = structuredClone(ast)
let deletionArtifact = selection.artifact
// Coerce sketch artifacts to their plane first
if (selection.artifact?.type === 'startSketchOnPlane') {
const planeArtifact = getArtifactOfTypes(
{ key: selection.artifact.planeId, types: ['plane'] },
artifactGraph
)
if (!err(planeArtifact)) {
deletionArtifact = planeArtifact
}
} else if (selection.artifact?.type === 'startSketchOnFace') {
const planeArtifact = getArtifactOfTypes(
{ key: selection.artifact.faceId, types: ['plane'] },
artifactGraph
)
if (!err(planeArtifact)) {
deletionArtifact = planeArtifact
}
}
if (
(selection.artifact?.type === 'plane' ||
selection.artifact?.type === 'cap' ||
selection.artifact?.type === 'wall') &&
selection.artifact?.pathIds?.length
(deletionArtifact?.type === 'plane' ||
deletionArtifact?.type === 'cap' ||
deletionArtifact?.type === 'wall') &&
deletionArtifact?.pathIds?.length
) {
const plane =
selection.artifact.type === 'plane'
? expandPlane(selection.artifact, artifactGraph)
: selection.artifact.type === 'wall'
? expandWall(selection.artifact, artifactGraph)
: expandCap(selection.artifact, artifactGraph)
deletionArtifact.type === 'plane'
? expandPlane(deletionArtifact, artifactGraph)
: deletionArtifact.type === 'wall'
? expandWall(deletionArtifact, artifactGraph)
: expandCap(deletionArtifact, artifactGraph)
for (const path of plane.paths.sort(
(a, b) => b.codeRef.range?.[0] - a.codeRef.range?.[0]
)) {
@ -1435,22 +1457,36 @@ export async function deleteFromSelection(
}
// If it's a cap, we're not going to continue and try to
// delete the extrusion
if (
selection.artifact.type === 'cap' ||
selection.artifact.type === 'wall'
) {
if (deletionArtifact.type === 'cap' || deletionArtifact.type === 'wall') {
// Delete the sketch node, which would not work if
// we continued down the traditional code path below.
// faceCodeRef's pathToNode is empty for some reason
// so using source range instead
const codeRef = getFaceCodeRef(selection.artifact)
const codeRef = getFaceCodeRef(deletionArtifact)
if (!codeRef) return new Error('Could not find face code ref')
const sketchVarDec = getNodePathFromSourceRange(astClone, codeRef.range)
const sketchBodyIndex = Number(sketchVarDec[1][0])
astClone.body.splice(sketchBodyIndex, 1)
return astClone
}
// If we coerced the artifact from a sketch to a plane,
// this is where we hop off after we delete the sketch variable declaration
if (
selection.artifact?.type === 'startSketchOnPlane' ||
selection.artifact?.type === 'startSketchOnFace'
) {
const sketchVarDec = getNodePathFromSourceRange(
astClone,
selection.artifact.codeRef.range
)
const sketchBodyIndex = Number(sketchVarDec[1][0])
astClone.body.splice(sketchBodyIndex, 1)
return astClone
}
}
// Below is all AST-based deletion logic
const varDec = getNodeFromPath<VariableDeclarator>(
ast,
selection?.codeRef?.pathToNode,