From 8a69f36972e1a2ded91f0d534aee7b830ec1aace Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Mon, 20 Mar 2023 11:50:50 -0700
Subject: [PATCH] commnts

---
 d2oracle/edit.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/d2oracle/edit.go b/d2oracle/edit.go
index 9b64ff38f..dd878fef1 100644
--- a/d2oracle/edit.go
+++ b/d2oracle/edit.go
@@ -643,7 +643,9 @@ func renameConflictsToParent(g *d2graph.Graph, key *d2ast.KeyPath) (*d2graph.Gra
 		return g, nil
 	}
 
+	// Keep a list of newly generated IDs, so that generateUniqueKey considers them for conflict
 	var newIDs []string
+	// If we already renamed the key from another reference, no need to touch
 	dedupedRenames := map[string]struct{}{}
 	for _, ref := range obj.References {
 		var absKeys []*d2ast.KeyPath
@@ -694,6 +696,7 @@ func renameConflictsToParent(g *d2graph.Graph, key *d2ast.KeyPath) (*d2graph.Gra
 			if _, ok := dedupedRenames[absKeyStr]; ok {
 				continue
 			}
+			// Stale reference
 			dedupedRenames[absKeyStr] = struct{}{}
 			// Do not consider the parent for conflicts, assume the parent will be deleted
 			if ida[len(ida)-1] == ida[len(ida)-2] {