Merge branch 'main' into jtran/fix-constraints

Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch>

src/clientSideScene/sceneEntities.ts

@@ -857,6 +857,11 @@ export class SceneEntities {
     let addingNewSegmentStatus: 'nothing' | 'pending' | 'added' = 'nothing'
     sceneInfra.setCallbacks({
       onDragEnd: async () => {
+        // After the user drags, code has been updated, and source ranges are
+        // potentially stale.
+        const astResult = kclManager.updateSourceRanges()
+        if (trap(astResult)) return
+
         if (addingNewSegmentStatus !== 'nothing') {
           await this.tearDownSketch({ removeAxis: false })
           this.setupSketch({

src/lang/KclSingleton.ts

@@ -154,6 +154,16 @@ export class KclManager {
     this._executeCallback = callback
   }
 
+  updateSourceRanges(): Error | null {
+    const newAst = parse(recast(this.ast))
+    if (err(newAst)) {
+      return newAst
+    }
+
+    this.ast = newAst
+    return null
+  }
+
   clearAst() {
     this._ast = {
       body: [],