Allow multiple profiles in the same sketch (#5196)
* Revert "Revert multi-profile (#4812)"
This reverts commit efe8089b08
.
* fix poor 1000ms wait UX
* A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores)
* trigger CI
* Add Rust side artifacts for startSketchOn face or plane (#4834)
* Add Rust side artifacts for startSketchOn face or plane
* move ast digging
---------
Co-authored-by: Kurt Hutten Irev-Dev <k.hutten@protonmail.ch>
* lint
* lint
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-macos-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-16-cores)
* trigger CI
* chore: disabled file watcher which prevents faster file write (#4835)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* partial fixes
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* Trigger CI
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* Trigger CI
* Fix up all the tests
* Fix partial execution
* wip
* WIP
* wip
* rust changes to make three point confrom to same as others since we're not ready with name params yet
* most of the fix for 3 point circle
* get overlays working for circle three point
* fmt
* fix types
* cargo fmt
* add face codef ref for walls and caps
* fix sketch on face after updates to rust side artifact graph
* some things needed for multi-profile tests
* bad attempts at fixing rust
* more
* more
* fix rust
* more rust fixes
* overlay fix
* remove duplicate test
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* lint and typing
* maybe fix a unit test
* small thing
* fix circ dep
* fix unit test
* fix some tests
* fix sweep point-and-click test
* fix more tests and add a fix me
* fix more tests
* fix electron specific test
* tsc
* more test tweaks
* update docs
* commint snaps?
* is clippy happy now?
* clippy again
* test works now without me changing anything big-fixed-itself
* small bug
* make three point have cross hair to make it consistent with othe rtools
* fix up state diagram
* fmt
* add draft point for first click of three point circ
* 1 test for three point circle
* 2 test for three point circle
* clean up
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* remove bad doc comment
* remove test skip
* remove onboarding test changes
* Update src/lang/modifyAst.ts
Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
* Update output from simulation tests
* Fix to use correct source ranges
This also reduces cloning.
* Change back to skipping face cap none and both
* Update output after changing back to skipping none and both
* Fix clippy warning
* fix profile start snap bug
* add path ids to cap
* fix going into edit sketch
* make other startSketchOn's work
* fix snapshot test
* explain function name
* Update src/lib/rectangleTool.ts
Co-authored-by: Frank Noirot <frank@zoo.dev>
* rename error
* remove file tree from diff
* Update src/clientSideScene/segments.ts
Co-authored-by: Frank Noirot <frank@zoo.dev>
* nit
* Prevent double write to KCL code on revolve
* Update output after adding cap-to-path graph edge
* Fix edit/select sketch-on-cap via feature tree
* clean up for face codeRef
* fix changing tools part way through circle/rect tools
* fix delete of circle profile
* fix close profiles
* fix closing profile bug (tangentArcTo being ignored)
* remove stale comment
* Delete paths associated with sketch when the sketch plane is deleted
* Add support for deleting sketches on caps (not walls)
* get delet working for walls
* make delet of extrusions work for multi profile
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* Delete the sketch statement too on the cap and wall cases
* Don't write to file in `split-sketch-pipe-if-needed` unless necessary
* Don't wait for file write to complete within `updateEditorWithAstAndWriteToFile`
It is already debounced internally. If we await it, we will have to wait for a debounced timeout
* docs
* fix circ dep
* tsc
* fix selection enter sketch weirdness
* test fixes
* comment out and fixme for delete related tests
* add skip wins
* try and get last test to pass
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
Co-authored-by: Kevin Nadro <nadr0@users.noreply.github.com>
Co-authored-by: Pierre Jacquier <pierre@zoo.dev>
Co-authored-by: 49lf <ircsurfer33@gmail.com>
Co-authored-by: Frank Noirot <frank@zoo.dev>
Co-authored-by: Frank Noirot <frankjohnson1993@gmail.com>
This commit is contained in:
@ -11,23 +11,50 @@ import {
|
||||
LiteralValue,
|
||||
NumericSuffix,
|
||||
} from './wasm'
|
||||
import { filterArtifacts } from 'lang/std/artifactGraph'
|
||||
import { filterArtifacts, getFaceCodeRef } from 'lang/std/artifactGraph'
|
||||
import { isArray, isOverlap } from 'lib/utils'
|
||||
|
||||
export function updatePathToNodeFromMap(
|
||||
oldPath: PathToNode,
|
||||
pathToNodeMap: { [key: number]: PathToNode }
|
||||
/**
|
||||
* Updates pathToNode body indices to account for the insertion of an expression
|
||||
* PathToNode expression is after the insertion index, that the body index is incremented
|
||||
* Negative insertion index means no insertion
|
||||
*/
|
||||
export function updatePathToNodePostExprInjection(
|
||||
pathToNode: PathToNode,
|
||||
exprInsertIndex: number
|
||||
): PathToNode {
|
||||
const updatedPathToNode = structuredClone(oldPath)
|
||||
let max = 0
|
||||
Object.values(pathToNodeMap).forEach((path) => {
|
||||
const index = Number(path[1][0])
|
||||
if (index > max) {
|
||||
max = index
|
||||
}
|
||||
})
|
||||
updatedPathToNode[1][0] = max
|
||||
return updatedPathToNode
|
||||
if (exprInsertIndex < 0) return pathToNode
|
||||
const bodyIndex = Number(pathToNode[1][0])
|
||||
if (bodyIndex < exprInsertIndex) return pathToNode
|
||||
const clone = structuredClone(pathToNode)
|
||||
clone[1][0] = bodyIndex + 1
|
||||
return clone
|
||||
}
|
||||
|
||||
export function updateSketchDetailsNodePaths({
|
||||
sketchEntryNodePath,
|
||||
sketchNodePaths,
|
||||
planeNodePath,
|
||||
exprInsertIndex,
|
||||
}: {
|
||||
sketchEntryNodePath: PathToNode
|
||||
sketchNodePaths: Array<PathToNode>
|
||||
planeNodePath: PathToNode
|
||||
exprInsertIndex: number
|
||||
}) {
|
||||
return {
|
||||
updatedSketchEntryNodePath: updatePathToNodePostExprInjection(
|
||||
sketchEntryNodePath,
|
||||
exprInsertIndex
|
||||
),
|
||||
updatedSketchNodePaths: sketchNodePaths.map((path) =>
|
||||
updatePathToNodePostExprInjection(path, exprInsertIndex)
|
||||
),
|
||||
updatedPlaneNodePath: updatePathToNodePostExprInjection(
|
||||
planeNodePath,
|
||||
exprInsertIndex
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
export function isCursorInSketchCommandRange(
|
||||
@ -36,20 +63,30 @@ export function isCursorInSketchCommandRange(
|
||||
): string | false {
|
||||
const overlappingEntries = filterArtifacts(
|
||||
{
|
||||
types: ['segment', 'path'],
|
||||
types: ['segment', 'path', 'plane', 'cap', 'wall'],
|
||||
predicate: (artifact) => {
|
||||
const codeRefRange = getFaceCodeRef(artifact)?.range
|
||||
return selectionRanges.graphSelections.some(
|
||||
(selection) =>
|
||||
isArray(selection?.codeRef?.range) &&
|
||||
isArray(artifact?.codeRef?.range) &&
|
||||
isOverlap(selection?.codeRef?.range, artifact.codeRef.range)
|
||||
isArray(codeRefRange) &&
|
||||
isOverlap(selection?.codeRef?.range, codeRefRange)
|
||||
)
|
||||
},
|
||||
},
|
||||
artifactGraph
|
||||
)
|
||||
const firstEntry = [...overlappingEntries.values()]?.[0]
|
||||
const parentId = firstEntry?.type === 'segment' ? firstEntry.pathId : false
|
||||
const parentId =
|
||||
firstEntry?.type === 'segment'
|
||||
? firstEntry.pathId
|
||||
: ((firstEntry?.type === 'plane' ||
|
||||
firstEntry?.type === 'cap' ||
|
||||
firstEntry?.type === 'wall') &&
|
||||
firstEntry.pathIds?.length) ||
|
||||
false
|
||||
? firstEntry.pathIds[0]
|
||||
: false
|
||||
|
||||
return parentId
|
||||
? parentId
|
||||
@ -81,11 +118,27 @@ export function findKwArg(
|
||||
label: string,
|
||||
call: CallExpressionKw
|
||||
): Expr | undefined {
|
||||
return call.arguments.find((arg) => {
|
||||
return call?.arguments?.find((arg) => {
|
||||
return arg.label.name === label
|
||||
})?.arg
|
||||
}
|
||||
|
||||
/**
|
||||
Search the keyword arguments from a call for an argument with this label,
|
||||
returns the index of the argument as well.
|
||||
*/
|
||||
export function findKwArgWithIndex(
|
||||
label: string,
|
||||
call: CallExpressionKw
|
||||
): { expr: Expr; argIndex: number } | undefined {
|
||||
const index = call.arguments.findIndex((arg) => {
|
||||
return arg.label.name === label
|
||||
})
|
||||
return index >= 0
|
||||
? { expr: call.arguments[index].arg, argIndex: index }
|
||||
: undefined
|
||||
}
|
||||
|
||||
/**
|
||||
Search the keyword arguments from a call for an argument with one of these labels.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user