internal/core/adt: fix notification CloseInfo

Theoretically we should use the closeID that
was passed upon registering the notification.
Although this seems to have no effect, we
add it for good posterity.

We also update all defIDs from a passed in
CloseID.

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: I6ceb2105bdb4c3c54d3c2f6deb4cde85fedf237d
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1218817
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>

Author: mpvl

internal/core/adt/conjunct.go

@@ -363,7 +363,8 @@ func (n *nodeContext) scheduleVertexConjuncts(c Conjunct, arc *Vertex, closeInfo
 		closeInfo = n.addResolver(arc, closeInfo, true)
 	}
 	c.CloseInfo.defID = closeInfo.defID
-	c.CloseInfo.outerID = closeInfo.defID
+	c.CloseInfo.outerID = closeInfo.outerID
+	c.CloseInfo.enclosingEmbed = closeInfo.enclosingEmbed
 
 	key := arcKey{arc, ciKey}
 	for _, k := range n.arcMap {
@@ -409,6 +410,7 @@ func (n *nodeContext) addNotify2(v *Vertex, c CloseInfo) {
 
 	for _, r := range n.notify {
 		if r.v == v {
+			// TODO: might need to add replacement here.
 			return
 		}
 	}
@@ -423,7 +425,7 @@ func (n *nodeContext) addNotify2(v *Vertex, c CloseInfo) {
 	// messages.
 	n.ctx.stats.Notifications++
 
-	n.notify = append(n.notify, receiver{v})
+	n.notify = append(n.notify, receiver{v, c})
 }
 
 // Literal conjuncts

internal/core/adt/eval.go

@@ -1280,6 +1280,7 @@ type nodeContextState struct {
 // v is equal to cc.src._cc in V3.
 type receiver struct {
 	v *Vertex
+	c CloseInfo
 }
 
 // Logf substitutes args in format. Arguments of type Feature, Value, and Expr
@@ -1304,7 +1305,7 @@ func (n *nodeContext) addNotify(v *Vertex) {
 	unreachableForDev(n.ctx)
 
 	if v != nil && !n.node.hasAllConjuncts {
-		n.notify = append(n.notify, receiver{v})
+		n.notify = append(n.notify, receiver{v: v})
 	}
 }
 

internal/core/adt/fields.go

@@ -233,7 +233,7 @@ func (v *Vertex) insertConjunct(ctx *OpContext, c Conjunct, id CloseInfo, mode A
 		// TODO: we should probably only notify a conjunct once the root of the
 		// conjunct group is completed. This will make it easier to "stitch" the
 		// conjunct trees together, as its correctness will be guaranteed.
-		rec.v.state.scheduleConjunct(c, id)
+		rec.v.state.scheduleConjunct(c, rec.c)
 	}
 
 	return