sketch revamp merge main #9213
Merged
sketch revamp merge main #9213
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… Decorations (#9133) * Codex: add a CodeMirror extension to show the artifact graph spans in editor * Clean up types and use doc comments * Remove visualizations of artifactGraph in EditorState I want to have a better way of defining debug behaviors before I add that. * Fix tsc and lints
…act code (#9167) * dep inject sceneInfra into modelingMenuCallbackMostActions * Dep inject sceneInfra into GizmoRenderer * Dep inject sceneInfra into selections * Dep inject sceneInfra into useOnFileRoute * Dep inject sceneInfra into modelingMachine * Dep inject sceneEntitiesManager (and friends) into modelingMachine * Singletons *gone* from modelingMachine, huzzah! * Singletons imports are *gone* from selections!
* Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso
… the major group (#9192) Bump glob in /.github/actions/github-release in the major group Bumps the major group in /.github/actions/github-release with 1 update: [glob](https://github.com/isaacs/node-glob). Updates `glob` from 11.1.0 to 13.0.0 - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](isaacs/node-glob@v11.1.0...v13.0.0) --- updated-dependencies: - dependency-name: glob dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
#9196) Bumps the patch group with 1 update: [taiki-e/install-action](https://github.com/taiki-e/install-action). Updates `taiki-e/install-action` from 2.62.38 to 2.62.62 - [Release notes](https://github.com/taiki-e/install-action/releases) - [Commits](taiki-e/install-action@v2.62.38...v2.62.62) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.62.62 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Convert theme toggling to CodeMirror Extension * Remove console.trace * Fix up editor E2E test locator
Bumps the minor group with 1 update: [crate-ci/typos](https://github.com/crate-ci/typos). Updates `crate-ci/typos` from 1.38.1 to 1.40.0 - [Release notes](https://github.com/crate-ci/typos/releases) - [Changelog](https://github.com/crate-ci/typos/blob/master/CHANGELOG.md) - [Commits](crate-ci/typos@v1.38.1...v1.40.0) --- updated-dependencies: - dependency-name: crate-ci/typos dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the patch group in /rust with 5 updates: | Package | From | To | | --- | --- | --- | | [tracing-subscriber](https://github.com/tokio-rs/tracing) | `0.3.20` | `0.3.22` | | [csscolorparser](https://github.com/mazznoer/csscolorparser-rs) | `0.8.0` | `0.8.1` | | [winnow](https://github.com/winnow-rs/winnow) | `0.7.13` | `0.7.14` | | [insta](https://github.com/mitsuhiko/insta) | `1.44.1` | `1.44.3` | | [wasm-bindgen-test](https://github.com/wasm-bindgen/wasm-bindgen) | `0.3.55` | `0.3.56` | Updates `tracing-subscriber` from 0.3.20 to 0.3.22 - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](tokio-rs/tracing@tracing-subscriber-0.3.20...tracing-subscriber-0.3.22) Updates `csscolorparser` from 0.8.0 to 0.8.1 - [Release notes](https://github.com/mazznoer/csscolorparser-rs/releases) - [Changelog](https://github.com/mazznoer/csscolorparser-rs/blob/master/CHANGELOG.md) - [Commits](mazznoer/csscolorparser-rs@v0.8.0...v0.8.1) Updates `winnow` from 0.7.13 to 0.7.14 - [Changelog](https://github.com/winnow-rs/winnow/blob/main/CHANGELOG.md) - [Commits](winnow-rs/winnow@v0.7.13...v0.7.14) Updates `insta` from 1.44.1 to 1.44.3 - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](mitsuhiko/insta@1.44.1...1.44.3) Updates `wasm-bindgen-test` from 0.3.55 to 0.3.56 - [Release notes](https://github.com/wasm-bindgen/wasm-bindgen/releases) - [Changelog](https://github.com/wasm-bindgen/wasm-bindgen/blob/main/CHANGELOG.md) - [Commits](https://github.com/wasm-bindgen/wasm-bindgen/commits) --- updated-dependencies: - dependency-name: tracing-subscriber dependency-version: 0.3.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: csscolorparser dependency-version: 0.8.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: winnow dependency-version: 0.7.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: insta dependency-version: 1.44.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: wasm-bindgen-test dependency-version: 0.3.56 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ajor group (#9193) Bump glob in /rust/kcl-language-server in the major group Bumps the major group in /rust/kcl-language-server with 1 update: [glob](https://github.com/isaacs/node-glob). Updates `glob` from 11.1.0 to 13.0.0 - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](isaacs/node-glob@v11.1.0...v13.0.0) --- updated-dependencies: - dependency-name: glob dependency-version: 13.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix ZK conversation history loss after manually reconnecting Fixes #9203 * Fix tests
Basically if -3 works then +3 should also work. Part of #9106. Currently `+` is just identity, it'll return the argument unchanged.
* Add function name in function expressions * Add binding function name * Update test to verify fn name binding * Add NodePath to new function name field * Add new AST field to the digest * Skip serializing name if it's none * Update generated output
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
CodSpeed Performance ReportMerging #9213 will not alter performanceComparing Summary
Footnotes
|
Irev-Dev
approved these changes
Dec 8, 2025
Irev-Dev
added a commit
that referenced
this pull request
Dec 9, 2025
* make cursor happy * Fix return of add_segment_stub() to be an object instead of a tuple * Revert building ts-rs bindings for kcl-api * Fix to not use kcl-api crate * Fix import type error * Add addSegment() method that calls the full implementation * Fix to preserve scene_objects to ExecOutcome with new_sketch() * Use more concise conversion to SourceRange * Add test for edit_line() * Fix to create sketch object before its contents to have a stable ID * Fix to take into account cached objects for next object ID * Change frontend to always use caching * Fix warnings from not using things depending on the artifact-graph cargo feature * Fix ts-rs types and avoid as any in TypeScript * Fix to be able to call add_segment() from TypeScript * Add point() KCL function and point segment type * Change to only warn if the sketch ID doesn't match on exit_sketch * Add a hacky way to set the current program AST * Add support for variable declaration for the sketch block * Fix addSegment() to not incorrectly JSON.parse() the WASM result * Fix serialization of SourceRef since ts-rs support for tuple types is bad * Rename and move functions to be clearer * Add test for adding a line, starting from an existing sketch block * Add doing a full traversal rather than only looking at the top-level items for the sketch block * Add other API functions to TypeScript side and fix addSegment types * Bump kcl-ezpz from 0.1.3 to 0.1.4 * Add KCL coincident() constraint function that supports points * Part 1: Add frontend API for adding coincident constraint This isn't done yet. * Add coincident() support for a known segment point and a var point2d, and two var point2ds * Factor out frontend state update * Add implementation of SketchExecOutcome for add_segment() * Add support for editing points in edit_segment() * Add SketchExecOutcome to return of edit_segment() * Fix TS definition of ApiPlane * make persistence for multiple points work (a bit better) * persistance bug * round * Fix new redundant clone lint warnings * Add add_coincident() Fix to find node when there's an existing variable declaration Add coincident support for fixed point Use a real unused variable name * Fix dfs to traverse the else block of if-else * use vars when adding points * add drag and coincident point and click * use var for editSegmentToo * use newSketch rust util * Fix to allow sketch on negative default planes and remove redundant plane type * Delete constructors that we're not ready for and may never use - MidePointLine - ThreePointArc - ThreePointCircle * use CSS2DObjects * match figma designs * more match designs tweaks * use design icons * Change edit segment API to allow editing multiple segments at once * Fix performance by using mock execution * Fix ApiObjectKind TS type * Add editing lines via their end points and fix to preserve constructors * Add allowing experimental features when calling new_sketch() * add the start of line tool (buggy) and update after rust nesting change * Add vertical() constraint * Add horizontal() constraint * Factor out common constraint code * Remove unused SketchExecOutcome type and descendents * edit segment with point * finish adding a segment * prep for line body draw * draw line body * Add support for adding coincident constraint on line end points * Fix clippy lints * Add constraints to scene objects * make coincident line end points animate correctly * Add equalLength() constraint on lines * hack set program on direct edit * add selection for line bodies, plus absract updating segments, finally add equal length * add horz vert * Change line.start and line.end to return the point objects instead of KCL arrays This fixes it so that sketch constraints like coincident can refer to the points by `ObjectId`. To refer to the KCL array coordinate, use `line.start.at` or `line.end.at`. * fix lint error * some hacks to make direct editing of code somewhat possible * Remove support for coincident with a non-point KCL array This fixes so that we always add a constraint to the scene objects. * fix bug with points being late to show in scene * update point styling * add segment hover * Upgrade to kcl-ezpz 0.1.5 * Add support for parallel constraint * cleane up on sketch mode exit * add parrallel constraint * get move working for selected Ids * clean up 'as's * refactor three.js onDrag abstraction to detect css2dObjects as well, and therefore fix bugs with multi-selection moves * don't direct import singletons * fix singleton dependencies * Update package-lock.json to match npm install * Add delete segments * Add delete constraints by changing delete_segments to delete_objects * Add test for deleting multiple segments at once * Fix coincident type to show that it only works on points now * Add distance(p1, p2) == x constraint * add area select * area select clean up * add breaks to toolbar * Add comments documenting sketch block execution * mostly good area select label * initial delete for sketch implemented - fails for when constraints are added * basic distance constraint * remove bad vars * Update generated output after main merge * Add feeding back solver solution to the source * Add sketchExecuteMock to call after editing segments * Change hackSetProgram() to return the SceneGraph and ExecOutcome * Add deleting segments cascades to also delete constraints that reference them * Delete redundant delete_constraint() API Use delete_objects() instead. * tweak * clean up uglyiness of css2dObjecs * Export length unit conversion function (#8982) Co-authored-by: Jonathan Tran <jonnytran@gmail.com> * mostly solve scale issue * Update snapshots * fix line width scale * fix area select scaling * Fix so that solver feedback works when there are empty sketch blocks at the end * Fix to call close() in frontend sketch tests * Fix error from main merge * Sketch 2.0 WIP: edit sketch UX (#9027) * start of edit sketch Still to implement is setting up the sketch scene, and making feature tree edit work * edit sketch basic flow working * remove async stuff from segments.ts, not needed * more async clean up, weird call back * fix drag issue when initially editing sketch * rust fmt * spell check * make edit sketch button work for new sketches * fix editing first sketch block * use ObjectId instead of usize * fire existing exit sketch actor * fmt * update sim tests * couple CI updates * update sim tests * fix bug in lsp index.ts * Use existing ArtifactId type and fill in real values when possible * increase timeout * add e2e test for sketch 2 * add e2e test for sketch 2 * more tests * break up sketch solve mode a bit * move out massive callbacks setup action * move actions out of sketchSolveMode * . * Update snapshots * desperate attempt to get a test to pass in CI * file rename * start refactoring and unit testing sketchSolveImle.ts * breakout and test onDragEnd * remove desperate test yolo * add more tests * more e2e test fix attempts * more desperate e2e tests * Update snapshots * add more tests * more tests * more test desperation * Update snapshots * more tests * fix e2e sketch test for electron hopefully * Add comment about constrained freedom * Remove speculative InEngine variant * rename files * quick fixture tweak * more file re-arranging * fix area select style logic. * break up mega function and add tests * fix intersection code to not be simple overlapping bounding boxes * Update generated output from main merge * feat: Solve following mouse pointer (#8991) * Add building up optional constraints from editing segments * Use local ezpz * Add calling ezpz with priority constraints * Fix to handle when the solver can't find a solution * Fix tests * Change solver max iterations to 1000 * Fix to use new priority_solved field * Update Cargo.lock after using updated ezpz optimization branch * Use released ezpz 0.2.0 * make line tool chainable * delet draft segment when uneqiping line tool * add escape logic at the lowest possible level * tests * tweaks from self review * update rust toml * fix circ deps and lint * Remove stub implementation that's no longer used * Delete commented code * tweaks * clean up * refactor action implementations in lineTool.ts * remove some logs * rename file * Update snapshots * fix up type * make hackSetProgram less hacky * test tweak * sim tests * Fix warning in wasm build * Fix to not serialize null ObjectId in program memory (#9177) * Fix to not serialize a lot of null values in program memory * Update generated output * remove voids * Remove unused kcl-api crate (#9176) Everything was moved back into kcl-lib to make prototyping easier. * Fix copy/paste error * perf: Use David's solver and reduce max iterations (#9172) * Change to use local branch of ezpz achalmers/new-solver * Change ezpz max iterations to 50 * Change to use released kcl-ezpz 0.2.1 * Update tests to match new output * remove as any * fix xstate visualiser for line tool * make draft lines grey * fix exit sketch button * sketch revamp merge main (#9213) * Add artifactGraph as StateField on EditorState, add artifact spans as Decorations (#9133) * Codex: add a CodeMirror extension to show the artifact graph spans in editor * Clean up types and use doc comments * Remove visualizations of artifactGraph in EditorState I want to have a better way of defining debug behaviors before I add that. * Fix tsc and lints * Dependency inject `sceneInfra` and `sceneEntitiesManager` into non-React code (#9167) * dep inject sceneInfra into modelingMenuCallbackMostActions * Dep inject sceneInfra into GizmoRenderer * Dep inject sceneInfra into selections * Dep inject sceneInfra into useOnFileRoute * Dep inject sceneInfra into modelingMachine * Dep inject sceneEntitiesManager (and friends) into modelingMachine * Singletons *gone* from modelingMachine, huzzah! * Singletons imports are *gone* from selections! * Update dependabot config (#9171) * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Update dependabot config from KittyCAD/ciso * Bump glob from 11.1.0 to 13.0.0 in /.github/actions/github-release in the major group (#9192) Bump glob in /.github/actions/github-release in the major group Bumps the major group in /.github/actions/github-release with 1 update: [glob](https://github.com/isaacs/node-glob). Updates `glob` from 11.1.0 to 13.0.0 - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](isaacs/node-glob@v11.1.0...v13.0.0) --- updated-dependencies: - dependency-name: glob dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump taiki-e/install-action from 2.62.38 to 2.62.62 in the patch group (#9196) Bumps the patch group with 1 update: [taiki-e/install-action](https://github.com/taiki-e/install-action). Updates `taiki-e/install-action` from 2.62.38 to 2.62.62 - [Release notes](https://github.com/taiki-e/install-action/releases) - [Commits](taiki-e/install-action@v2.62.38...v2.62.62) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.62.62 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Convert CodeMirror theme toggling behavior to Extension (#9063) * Convert theme toggling to CodeMirror Extension * Remove console.trace * Fix up editor E2E test locator * Bump crate-ci/typos from 1.38.1 to 1.40.0 in the minor group (#9199) Bumps the minor group with 1 update: [crate-ci/typos](https://github.com/crate-ci/typos). Updates `crate-ci/typos` from 1.38.1 to 1.40.0 - [Release notes](https://github.com/crate-ci/typos/releases) - [Changelog](https://github.com/crate-ci/typos/blob/master/CHANGELOG.md) - [Commits](crate-ci/typos@v1.38.1...v1.40.0) --- updated-dependencies: - dependency-name: crate-ci/typos dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the patch group in /rust with 5 updates (#9195) Bumps the patch group in /rust with 5 updates: | Package | From | To | | --- | --- | --- | | [tracing-subscriber](https://github.com/tokio-rs/tracing) | `0.3.20` | `0.3.22` | | [csscolorparser](https://github.com/mazznoer/csscolorparser-rs) | `0.8.0` | `0.8.1` | | [winnow](https://github.com/winnow-rs/winnow) | `0.7.13` | `0.7.14` | | [insta](https://github.com/mitsuhiko/insta) | `1.44.1` | `1.44.3` | | [wasm-bindgen-test](https://github.com/wasm-bindgen/wasm-bindgen) | `0.3.55` | `0.3.56` | Updates `tracing-subscriber` from 0.3.20 to 0.3.22 - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](tokio-rs/tracing@tracing-subscriber-0.3.20...tracing-subscriber-0.3.22) Updates `csscolorparser` from 0.8.0 to 0.8.1 - [Release notes](https://github.com/mazznoer/csscolorparser-rs/releases) - [Changelog](https://github.com/mazznoer/csscolorparser-rs/blob/master/CHANGELOG.md) - [Commits](mazznoer/csscolorparser-rs@v0.8.0...v0.8.1) Updates `winnow` from 0.7.13 to 0.7.14 - [Changelog](https://github.com/winnow-rs/winnow/blob/main/CHANGELOG.md) - [Commits](winnow-rs/winnow@v0.7.13...v0.7.14) Updates `insta` from 1.44.1 to 1.44.3 - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](mitsuhiko/insta@1.44.1...1.44.3) Updates `wasm-bindgen-test` from 0.3.55 to 0.3.56 - [Release notes](https://github.com/wasm-bindgen/wasm-bindgen/releases) - [Changelog](https://github.com/wasm-bindgen/wasm-bindgen/blob/main/CHANGELOG.md) - [Commits](https://github.com/wasm-bindgen/wasm-bindgen/commits) --- updated-dependencies: - dependency-name: tracing-subscriber dependency-version: 0.3.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: csscolorparser dependency-version: 0.8.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: winnow dependency-version: 0.7.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: insta dependency-version: 1.44.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: wasm-bindgen-test dependency-version: 0.3.56 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Enable retries on integration tests (#9201) * Bump glob from 11.1.0 to 13.0.0 in /rust/kcl-language-server in the major group (#9193) Bump glob in /rust/kcl-language-server in the major group Bumps the major group in /rust/kcl-language-server with 1 update: [glob](https://github.com/isaacs/node-glob). Updates `glob` from 11.1.0 to 13.0.0 - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](isaacs/node-glob@v11.1.0...v13.0.0) --- updated-dependencies: - dependency-name: glob dependency-version: 13.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Revert "Keep Text-to-CAD credits for consistency in billing indicator" (#9185) * Revert "Keep Text-to-CAD credits for consistency in billing indicator (#9175)" This reverts commit 58ef9bf. * Bump react-shared * Update package-lock.json (#9207) * Fix ZK conversation history loss after manually reconnecting (#9205) * Fix ZK conversation history loss after manually reconnecting Fixes #9203 * Fix tests * KCL: Support unary + operator (#9202) Basically if -3 works then +3 should also work. Part of #9106. Currently `+` is just identity, it'll return the argument unchanged. * Add KCL named function expressions (#9206) * Add function name in function expressions * Add binding function name * Update test to verify fn name binding * Add NodePath to new function name field * Add new AST field to the digest * Skip serializing name if it's none * Update generated output * Add reviewValidation to Insert to check on execution (#9187) Fixes #9141 * Update artifact output --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Frank Noirot <frank@zoo.dev> Co-authored-by: Max Ammann <max@maxammann.org> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jace Browning <jacebrowning@gmail.com> Co-authored-by: Pierre Jacquier <pierre@zoo.dev> Co-authored-by: Adam Chalmers <adam.chalmers@zoo.dev> * fix tests * few fix ups * fix persistance issue * update test * Override snapshot images with versions from main * remove specifics from tests descriptions * remove inital scene graph where possible * convert comments to doc strings * improve doc strings * follow up docs * fmt * remove any * move area select utils into own module * make rust happ * remove some redundant stuff from the sketch solve machines * fix tear down * fix bug with tear down * make delete of CSS2DObjects not a special case * remove bad TODO * move areaSelect tests into it's own test file * add unit clarifying comment * make lint happy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Jonathan Tran <jonnytran@gmail.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Frank Noirot <frank@zoo.dev> Co-authored-by: Max Ammann <max@maxammann.org> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jace Browning <jacebrowning@gmail.com> Co-authored-by: Pierre Jacquier <pierre@zoo.dev> Co-authored-by: Adam Chalmers <adam.chalmers@zoo.dev>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stacked on #9170.
npm-test-unit failures seem related to the recent draft segment changes, not the main merge.
There were merge conflicts on these files:
rust/kcl-lib/src/execution/exec_ast.rssrc/components/ModelingMachineProvider.tsxsrc/components/layout/areas/FeatureTreePane.tsxsrc/editor/plugins/lsp/kcl/index.tssrc/lib/selections.tssrc/machines/modelingMachine.tssrc/machines/modelingSharedContext.tssrc/machines/modelingSharedTypes.tssrc/machines/sketchSolve/sketchSolveMode.tsvitest.config.ts