* 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
* WIP: Add Delete right click menu item to Feature Tree
Copying code around
Fixes #5090
* I don't know why it works
* WIP
* fix circ dep
* fix unit test
* fix some tests
* 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)
* Working deletion machine loo
* Working helix deletion
* Extend deletion to more things
* 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)
* 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
* WIP: migrate to actor
* 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
* Continue actor migration
* Prevent double write to KCL code on revolve
* Clean up
* Update output after adding cap-to-path graph edge
* Clean up
* Update machine diag
* Update context menu hotkey class
* 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
* Fix bad conflict resolution
* Fix a few things post merge
* Add guard back, fixing tests
* 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)
* Add e2e test
* Working tests on ubuntu
* Another one
* Update src/machines/featureTreeMachine.ts
Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch>
* Fix sketch test
@Irev-Dev's suggestion
---------
Co-authored-by: Kurt Hutten Irev-Dev <k.hutten@protonmail.ch>
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: 49lf <ircsurfer33@gmail.com>
Co-authored-by: Frank Noirot <frank@zoo.dev>
Co-authored-by: Frank Noirot <frankjohnson1993@gmail.com>
414 lines
12 KiB
TypeScript
414 lines
12 KiB
TypeScript
import { Diagnostic } from '@codemirror/lint'
|
|
import { useMachine, useSelector } from '@xstate/react'
|
|
import { ContextMenu, ContextMenuItem } from 'components/ContextMenu'
|
|
import { CustomIcon, CustomIconName } from 'components/CustomIcon'
|
|
import Loading from 'components/Loading'
|
|
import { useModelingContext } from 'hooks/useModelingContext'
|
|
import { useKclContext } from 'lang/KclProvider'
|
|
import { codeRefFromRange, getArtifactFromRange } from 'lang/std/artifactGraph'
|
|
import { sourceRangeFromRust } from 'lang/wasm'
|
|
import {
|
|
filterOperations,
|
|
getOperationIcon,
|
|
getOperationLabel,
|
|
stdLibMap,
|
|
} from 'lib/operations'
|
|
import { editorManager, engineCommandManager, kclManager } from 'lib/singletons'
|
|
import { ComponentProps, useEffect, useMemo, useRef, useState } from 'react'
|
|
import { Operation } from 'wasm-lib/kcl/bindings/Operation'
|
|
import { Actor, Prop } from 'xstate'
|
|
import { featureTreeMachine } from 'machines/featureTreeMachine'
|
|
import {
|
|
editorIsMountedSelector,
|
|
kclEditorActor,
|
|
selectionEventSelector,
|
|
} from 'machines/kclEditorMachine'
|
|
|
|
export const FeatureTreePane = () => {
|
|
const isEditorMounted = useSelector(kclEditorActor, editorIsMountedSelector)
|
|
const lastSelectionEvent = useSelector(kclEditorActor, selectionEventSelector)
|
|
const { send: modelingSend, state: modelingState } = useModelingContext()
|
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
const [_featureTreeState, featureTreeSend] = useMachine(
|
|
featureTreeMachine.provide({
|
|
guards: {
|
|
codePaneIsOpen: () =>
|
|
modelingState.context.store.openPanes.includes('code') &&
|
|
editorManager.editorView !== null,
|
|
},
|
|
actions: {
|
|
openCodePane: () => {
|
|
modelingSend({
|
|
type: 'Set context',
|
|
data: {
|
|
openPanes: [...modelingState.context.store.openPanes, 'code'],
|
|
},
|
|
})
|
|
},
|
|
sendEditFlowStart: () => {
|
|
modelingSend({ type: 'Enter sketch' })
|
|
},
|
|
scrollToError: () => {
|
|
editorManager.scrollToFirstErrorDiagnosticIfExists()
|
|
},
|
|
sendSelectionEvent: ({ context }) => {
|
|
if (!context.targetSourceRange) {
|
|
return
|
|
}
|
|
const artifact = context.targetSourceRange
|
|
? getArtifactFromRange(
|
|
context.targetSourceRange,
|
|
engineCommandManager.artifactGraph
|
|
)
|
|
: null
|
|
|
|
if (!artifact) {
|
|
modelingSend({
|
|
type: 'Set selection',
|
|
data: {
|
|
selectionType: 'singleCodeCursor',
|
|
selection: {
|
|
codeRef: codeRefFromRange(
|
|
context.targetSourceRange,
|
|
kclManager.ast
|
|
),
|
|
},
|
|
scrollIntoView: true,
|
|
},
|
|
})
|
|
} else {
|
|
modelingSend({
|
|
type: 'Set selection',
|
|
data: {
|
|
selectionType: 'singleCodeCursor',
|
|
selection: {
|
|
artifact: artifact,
|
|
codeRef: codeRefFromRange(
|
|
context.targetSourceRange,
|
|
kclManager.ast
|
|
),
|
|
},
|
|
scrollIntoView: true,
|
|
},
|
|
})
|
|
}
|
|
},
|
|
},
|
|
})
|
|
)
|
|
// If there are parse errors we show the last successful operations
|
|
// and overlay a message on top of the pane
|
|
const parseErrors = kclManager.errors.filter((e) => e.kind !== 'engine')
|
|
|
|
// If there are engine errors we show the successful operations
|
|
// Errors return an operation list, so use the longest one if there are multiple
|
|
const longestErrorOperationList = kclManager.errors.reduce((acc, error) => {
|
|
return error.operations && error.operations.length > acc.length
|
|
? error.operations
|
|
: acc
|
|
}, [] as Operation[])
|
|
|
|
const unfilteredOperationList = !parseErrors.length
|
|
? !kclManager.errors.length
|
|
? kclManager.execState.operations
|
|
: longestErrorOperationList
|
|
: kclManager.lastSuccessfulOperations
|
|
|
|
// We filter out operations that are not useful to show in the feature tree
|
|
const operationList = filterOperations(unfilteredOperationList)
|
|
|
|
// Watch for changes in the open panes and send an event to the feature tree machine
|
|
useEffect(() => {
|
|
const codeOpen = modelingState.context.store.openPanes.includes('code')
|
|
if (codeOpen && isEditorMounted) {
|
|
featureTreeSend({ type: 'codePaneOpened' })
|
|
}
|
|
}, [modelingState.context.store.openPanes, isEditorMounted])
|
|
|
|
// Watch for changes in the selection and send an event to the feature tree machine
|
|
useEffect(() => {
|
|
featureTreeSend({ type: 'selected' })
|
|
}, [lastSelectionEvent])
|
|
|
|
function goToError() {
|
|
featureTreeSend({ type: 'goToError' })
|
|
}
|
|
|
|
return (
|
|
<div className="relative">
|
|
<section
|
|
data-testid="debug-panel"
|
|
className="absolute inset-0 p-1 box-border overflow-auto"
|
|
>
|
|
{kclManager.isExecuting ? (
|
|
<Loading className="h-full">Building feature tree...</Loading>
|
|
) : (
|
|
<>
|
|
{parseErrors.length > 0 && (
|
|
<div
|
|
className={`absolute inset-0 rounded-lg p-2 ${
|
|
operationList.length &&
|
|
`bg-destroy-10/40 dark:bg-destroy-80/40`
|
|
}`}
|
|
>
|
|
<div className="text-sm bg-destroy-80 text-chalkboard-10 py-1 px-2 rounded flex gap-2 items-center">
|
|
<p className="flex-1">
|
|
Errors found in KCL code.
|
|
<br />
|
|
Please fix them before continuing.
|
|
</p>
|
|
<button
|
|
onClick={goToError}
|
|
className="bg-chalkboard-10 text-destroy-80 p-1 rounded-sm flex-none hover:bg-chalkboard-10 hover:border-destroy-70 hover:text-destroy-80 border-transparent"
|
|
>
|
|
View error
|
|
</button>
|
|
</div>
|
|
</div>
|
|
)}
|
|
{operationList.map((operation) => {
|
|
const key = `${operation.type}-${
|
|
'name' in operation ? operation.name : 'anonymous'
|
|
}-${
|
|
'sourceRange' in operation ? operation.sourceRange[0] : 'start'
|
|
}`
|
|
|
|
return (
|
|
<OperationItem
|
|
key={key}
|
|
item={operation}
|
|
send={featureTreeSend}
|
|
/>
|
|
)
|
|
})}
|
|
</>
|
|
)}
|
|
</section>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
export const visibilityMap = new Map<string, boolean>()
|
|
|
|
interface VisibilityToggleProps {
|
|
entityId: string
|
|
initialVisibility: boolean
|
|
onVisibilityChange?: () => void
|
|
}
|
|
|
|
/**
|
|
* A button that toggles the visibility of an entity
|
|
* tied to an artifact in the feature tree.
|
|
* TODO: this is unimplemented and will be used for
|
|
* default planes after we fix them and add them to the artifact graph / feature tree
|
|
*/
|
|
const VisibilityToggle = (props: VisibilityToggleProps) => {
|
|
const [visible, setVisible] = useState(props.initialVisibility)
|
|
|
|
function handleToggleVisible() {
|
|
setVisible(!visible)
|
|
visibilityMap.set(props.entityId, !visible)
|
|
props.onVisibilityChange?.()
|
|
}
|
|
|
|
return (
|
|
<button
|
|
onClick={handleToggleVisible}
|
|
className="border-transparent p-0 m-0"
|
|
>
|
|
<CustomIcon
|
|
name={visible ? 'eyeOpen' : 'eyeCrossedOut'}
|
|
className={`w-5 h-5 ${
|
|
visible
|
|
? 'hidden group-hover/item:block group-focus-within/item:block'
|
|
: 'text-chalkboard-50'
|
|
}`}
|
|
/>
|
|
</button>
|
|
)
|
|
}
|
|
|
|
/**
|
|
* More generic version of OperationListItem,
|
|
* to be used for default planes after we fix them and
|
|
* add them to the artifact graph / feature tree
|
|
*/
|
|
const OperationItemWrapper = ({
|
|
icon,
|
|
name,
|
|
visibilityToggle,
|
|
menuItems,
|
|
errors,
|
|
className,
|
|
...props
|
|
}: React.HTMLAttributes<HTMLButtonElement> & {
|
|
icon: CustomIconName
|
|
name: string
|
|
visibilityToggle?: VisibilityToggleProps
|
|
menuItems?: ComponentProps<typeof ContextMenu>['items']
|
|
errors?: Diagnostic[]
|
|
}) => {
|
|
const menuRef = useRef<HTMLDivElement>(null)
|
|
|
|
return (
|
|
<div
|
|
ref={menuRef}
|
|
className="flex select-none items-center group/item my-0 py-0.5 px-1 focus-within:bg-primary/10 hover:bg-primary/5"
|
|
>
|
|
<button
|
|
{...props}
|
|
className={`reset flex-1 flex items-center gap-2 border-transparent dark:border-transparent text-left text-base ${className}`}
|
|
>
|
|
<CustomIcon name={icon} className="w-5 h-5 block" />
|
|
{name}
|
|
</button>
|
|
{errors && errors.length > 0 && (
|
|
<em className="text-destroy-80 text-xs">has error</em>
|
|
)}
|
|
{visibilityToggle && <VisibilityToggle {...visibilityToggle} />}
|
|
{menuItems && (
|
|
<ContextMenu menuTargetElement={menuRef} items={menuItems} />
|
|
)}
|
|
</div>
|
|
)
|
|
}
|
|
|
|
/**
|
|
* A button with an icon, name, and context menu
|
|
* for an operation in the feature tree.
|
|
*/
|
|
const OperationItem = (props: {
|
|
item: Operation
|
|
send: Prop<Actor<typeof featureTreeMachine>, 'send'>
|
|
}) => {
|
|
const kclContext = useKclContext()
|
|
const name =
|
|
'name' in props.item && props.item.name !== null
|
|
? getOperationLabel(props.item)
|
|
: 'anonymous'
|
|
const errors = useMemo(() => {
|
|
return kclContext.diagnostics.filter(
|
|
(diag) =>
|
|
diag.severity === 'error' &&
|
|
'sourceRange' in props.item &&
|
|
diag.from >= props.item.sourceRange[0] &&
|
|
diag.to <= props.item.sourceRange[1]
|
|
)
|
|
}, [kclContext.diagnostics.length])
|
|
|
|
function selectOperation() {
|
|
if (props.item.type === 'UserDefinedFunctionReturn') {
|
|
return
|
|
}
|
|
props.send({
|
|
type: 'selectOperation',
|
|
data: {
|
|
targetSourceRange: sourceRangeFromRust(props.item.sourceRange),
|
|
},
|
|
})
|
|
}
|
|
|
|
/**
|
|
* For now we can only enter the "edit" flow for the startSketchOn operation.
|
|
* TODO: https://github.com/KittyCAD/modeling-app/issues/4442
|
|
*/
|
|
function enterEditFlow() {
|
|
if (props.item.type === 'StdLibCall') {
|
|
props.send({
|
|
type: 'enterEditFlow',
|
|
data: {
|
|
targetSourceRange: sourceRangeFromRust(props.item.sourceRange),
|
|
currentOperation: props.item,
|
|
},
|
|
})
|
|
}
|
|
}
|
|
|
|
function deleteOperation() {
|
|
if (
|
|
props.item.type === 'StdLibCall' ||
|
|
props.item.type === 'UserDefinedFunctionCall'
|
|
) {
|
|
props.send({
|
|
type: 'deleteOperation',
|
|
data: {
|
|
targetSourceRange: sourceRangeFromRust(props.item.sourceRange),
|
|
},
|
|
})
|
|
}
|
|
}
|
|
|
|
const menuItems = useMemo(
|
|
() => [
|
|
<ContextMenuItem
|
|
onClick={() => {
|
|
if (props.item.type === 'UserDefinedFunctionReturn') {
|
|
return
|
|
}
|
|
props.send({
|
|
type: 'goToKclSource',
|
|
data: {
|
|
targetSourceRange: sourceRangeFromRust(props.item.sourceRange),
|
|
},
|
|
})
|
|
}}
|
|
>
|
|
View KCL source code
|
|
</ContextMenuItem>,
|
|
...(props.item.type === 'UserDefinedFunctionCall'
|
|
? [
|
|
<ContextMenuItem
|
|
onClick={() => {
|
|
if (props.item.type !== 'UserDefinedFunctionCall') {
|
|
return
|
|
}
|
|
const functionRange = props.item.functionSourceRange
|
|
// For some reason, the cursor goes to the end of the source
|
|
// range we select. So set the end equal to the beginning.
|
|
functionRange[1] = functionRange[0]
|
|
props.send({
|
|
type: 'goToKclSource',
|
|
data: {
|
|
targetSourceRange: sourceRangeFromRust(functionRange),
|
|
},
|
|
})
|
|
}}
|
|
>
|
|
View function definition
|
|
</ContextMenuItem>,
|
|
]
|
|
: []),
|
|
...(props.item.type === 'StdLibCall'
|
|
? [
|
|
<ContextMenuItem
|
|
disabled={!stdLibMap[props.item.name]?.prepareToEdit}
|
|
onClick={enterEditFlow}
|
|
hotkey="Double click"
|
|
>
|
|
Edit
|
|
</ContextMenuItem>,
|
|
]
|
|
: []),
|
|
<ContextMenuItem
|
|
onClick={deleteOperation}
|
|
hotkey="Delete"
|
|
data-testid="context-menu-delete"
|
|
>
|
|
Delete
|
|
</ContextMenuItem>,
|
|
],
|
|
[props.item, props.send]
|
|
)
|
|
|
|
return (
|
|
<OperationItemWrapper
|
|
icon={getOperationIcon(props.item)}
|
|
name={name}
|
|
menuItems={menuItems}
|
|
onClick={selectOperation}
|
|
onDoubleClick={enterEditFlow}
|
|
errors={errors}
|
|
/>
|
|
)
|
|
}
|