Merge pull request terrastruct#962 from alixander/fix-id-delta-4

delete hoisting children should ignore parent id
nhooyr · Mar 3, 2023 · 996a1c6 · 996a1c6
2 parents f6550eb + 37ff3fb
commit 996a1c6
Show file tree

Hide file tree

Showing 3 changed files with 285 additions and 1 deletion.
diff --git a/d2oracle/edit.go b/d2oracle/edit.go
@@ -702,7 +702,7 @@ func renameConflictsToParent(g *d2graph.Graph, key *d2ast.KeyPath) (*d2graph.Gra
 			hoistedAbsKey.Path = append(hoistedAbsKey.Path, ref.Key.Path[:ref.KeyPathIndex]...)
 			hoistedAbsKey.Path = append(hoistedAbsKey.Path, absKey.Path[len(absKey.Path)-1])
 
-			uniqueKeyStr, _, err := generateUniqueKey(g, strings.Join(d2graph.Key(hoistedAbsKey), "."), nil, newIDs)
+			uniqueKeyStr, _, err := generateUniqueKey(g, strings.Join(d2graph.Key(hoistedAbsKey), "."), obj, newIDs)
 			if err != nil {
 				return nil, err
 			}

diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go
@@ -4834,6 +4834,24 @@ Square: {
 Text: {
   Text 2
 }
+Text 2
+`,
+		},
+		{
+			name: "conflicts_generated_continued",
+			text: `Text 4
+
+Text: {
+  Text 2
+}
+Text 2
+`,
+			key: `Text`,
+
+			exp: `Text 4
+
+Text
+
 Text 2
 `,
 		},
@@ -5399,6 +5417,22 @@ Square: {
   "Square.Text": "Text 2",
   "Square.Text 4": "Text",
   "Square.Text 4.Text 2": "Text.Text 2"
+}`,
+		},
+		{
+			name: "delete_generated_id_conflicts_2_continued",
+
+			text: `Text 4
+
+Text: {
+  Text 2
+}
+Text 2
+`,
+			key: "Text",
+
+			exp: `{
+  "Text.Text 2": "Text"
 }`,
 		},
 	}

diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json