Merge pull request #1073 from alixander/fix-generated-containers-delete

Fix generated containers delete

d2oracle/edit.go

@@ -2048,6 +2048,15 @@ func DeleteIDDeltas(g *d2graph.Graph, key string) (deltas map[string]string, err
 		if !ok {
 			return nil, nil
 		}
+
+		ignored := obj
+		for _, ch := range obj.ChildrenArray {
+			if ch.ID == obj.ID {
+				ignored = nil
+				break
+			}
+		}
+
 		for _, ch := range obj.ChildrenArray {
 			// Record siblings as the unique key generated should not conflict with any siblings either
 			var siblingsToBeHoisted []string
@@ -2094,7 +2103,7 @@ func DeleteIDDeltas(g *d2graph.Graph, key string) (deltas map[string]string, err
 			}
 
 			if conflictingObj, ok := g.Root.HasChild(d2graph.Key(hoistedMK.Key)); (ok && conflictingObj != obj) || conflictsWithNewID {
-				newKey, _, err := generateUniqueKey(g, hoistedAbsID, obj, append(newIDs, siblingsToBeHoisted...))
+				newKey, _, err := generateUniqueKey(g, hoistedAbsID, ignored, append(newIDs, siblingsToBeHoisted...))
 				if err != nil {
 					return nil, err
 				}

d2oracle/edit_test.go

@@ -3526,6 +3526,29 @@ func TestDelete(t *testing.T) {
 			key: `x`,
 
 			exp: `x.y.z -> y.b
+`,
+		},
+		{
+			name: "duplicate_generated",
+
+			text: `x
+x 2
+x 3: {
+  x 3
+  x 4
+}
+x 4
+y
+`,
+			key: `x 3`,
+			exp: `x
+x 2
+
+x 3
+x 5
+
+x 4
+y
 `,
 		},
 		{
@@ -5503,6 +5526,24 @@ x.y.z.w.e.p.l -> x.y.z.1.2.3.4
 
 			exp: `{
   "x.x": "x"
+}`,
+		},
+		{
+			name: "duplicate_generated",
+
+			text: `x
+x 2
+x 3: {
+  x 3
+  x 4
+}
+x 4
+y
+`,
+			key: `x 3`,
+			exp: `{
+  "x 3.x 3": "x 3",
+  "x 3.x 4": "x 5"
 }`,
 		},
 		{