internal/core/adt: hoist newGroup logic

We will use this call in another location
later as well. Note that we chose to not
generalize this function and hoist the
similar logic in addResolver as well. This
keeps the function simple, as there are
too many differences for this to be
convenient.

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

Author: mpvl

internal/core/adt/typocheck.go

@@ -333,6 +333,19 @@ func (n *nodeContext) addResolver(v *Vertex, id CloseInfo, forceIgnore bool) Clo
 	return id
 }
 
+func (n *nodeContext) newGroup(id CloseInfo) (CloseInfo, defID) {
+	srcID := id.defID
+	dstID := n.ctx.getNextDefID()
+	n.reqDefIDs = append(n.reqDefIDs, refInfo{
+		v:      emptyNode,
+		id:     dstID,
+		ignore: true,
+	})
+	id.defID = dstID
+	n.addReplacement(replaceID{from: srcID, to: dstID, add: true})
+	return id, dstID
+}
+
 // AddOpenConjunct adds w as a conjunct of v and disables typo checking for w,
 // even if it is a definition.
 func (v *Vertex) AddOpenConjunct(ctx *OpContext, w *Vertex) {
@@ -379,17 +392,9 @@ func (n *nodeContext) injectEmbedNode(x Decl, id CloseInfo) CloseInfo {
 		}
 	}
 
-	dstID := n.ctx.getNextDefID()
-	n.reqDefIDs = append(n.reqDefIDs, refInfo{
-		v:      emptyNode,
-		id:     dstID,
-		ignore: true,
-	})
-	id.defID = dstID
+	id, dstID := n.newGroup(id)
 	id.enclosingEmbed = dstID
 
-	n.addReplacement(replaceID{from: srcID, to: dstID, add: true})
-
 	return id
 }
 
@@ -422,23 +427,13 @@ func (n *nodeContext) splitDefID(s *StructLit, id CloseInfo) CloseInfo {
 		return id
 	}
 
-	srcID := id.defID
-
-	dstID := n.ctx.getNextDefID()
-	n.reqDefIDs = append(n.reqDefIDs, refInfo{
-		v:      emptyNode,
-		id:     dstID,
-		ignore: true,
-	})
-	id.defID = dstID
+	id, dstID := n.newGroup(id)
 
 	if !id.hasOuter {
 		id.hasOuter = true
 		id.outerID = dstID
 	}
 
-	n.addReplacement(replaceID{from: srcID, to: dstID, add: true})
-
 	return id
 }