From e6750a99b65dfc113ec7171233aa07e4ff21e123 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 1 Jun 2023 19:42:40 -0700 Subject: [PATCH] fix renameiddelta --- d2oracle/edit.go | 22 ++- d2oracle/edit_test.go | 24 +++ .../TestRename/generated-conflict.exp.json | 180 ++++++++++++++++++ 3 files changed, 217 insertions(+), 9 deletions(-) create mode 100644 testdata/d2oracle/TestRename/generated-conflict.exp.json diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 1fbf2caf2..566a0a573 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -2735,7 +2735,7 @@ func RenameIDDeltas(g *d2graph.Graph, key, newName string) (deltas map[string]st } mk.Key.Path[len(mk.Key.Path)-1].Unbox().SetString(newName) - uniqueKeyStr, _, err := generateUniqueKey(g, strings.Join(d2graph.Key(mk.Key), "."), nil, nil) + uniqueKeyStr, _, err := generateUniqueKey(g, strings.Join(d2graph.Key(mk.Key), "."), obj, nil) if err != nil { return nil, err } @@ -2749,19 +2749,23 @@ func RenameIDDeltas(g *d2graph.Graph, key, newName string) (deltas map[string]st beforeObjID := obj.ID appendNodeDelta := func(ch *d2graph.Object) { - beforeID := ch.AbsID() - obj.ID = newNameKey - deltas[beforeID] = ch.AbsID() - obj.ID = beforeObjID + if obj.ID != newNameKey { + beforeID := ch.AbsID() + obj.ID = newNameKey + deltas[beforeID] = ch.AbsID() + obj.ID = beforeObjID + } } appendEdgeDelta := func(ch *d2graph.Object) { for _, e := range obj.Graph.Edges { if e.Src == ch || e.Dst == ch { - beforeID := e.AbsID() - obj.ID = newNameKey - deltas[beforeID] = e.AbsID() - obj.ID = beforeObjID + if obj.ID != newNameKey { + beforeID := e.AbsID() + obj.ID = newNameKey + deltas[beforeID] = e.AbsID() + obj.ID = beforeObjID + } } } } diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index 7f2afb369..a48bcc0d1 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -1840,6 +1840,19 @@ func TestRename(t *testing.T) { newName: `Square`, exp: `Square +`, + }, + { + name: "generated-conflict", + + text: `Square +Square 2 +`, + key: `Square 2`, + newName: `Square`, + + exp: `Square +Square 2 `, }, { @@ -7261,6 +7274,17 @@ y "x": "y 2" }`, }, + { + name: "generated-conflict", + + text: `Square +Square 2 +`, + key: `Square 2`, + newName: `Square`, + + exp: `{}`, + }, { name: "rename_conflict_with_dots", diff --git a/testdata/d2oracle/TestRename/generated-conflict.exp.json b/testdata/d2oracle/TestRename/generated-conflict.exp.json new file mode 100644 index 000000000..9e3866c39 --- /dev/null +++ b/testdata/d2oracle/TestRename/generated-conflict.exp.json @@ -0,0 +1,180 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-2:0:16", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "value": [ + { + "string": "Square", + "raw_string": "Square" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "value": [ + { + "string": "Square 2", + "raw_string": "Square 2" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "Square", + "id_val": "Square", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,0:0:0-0:6:6", + "value": [ + { + "string": "Square", + "raw_string": "Square" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "Square" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + }, + { + "id": "Square 2", + "id_val": "Square 2", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestRename/generated-conflict.d2,1:0:7-1:8:15", + "value": [ + { + "string": "Square 2", + "raw_string": "Square 2" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "Square 2" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": { + "value": "" + } + }, + "zIndex": 0 + } + ] + }, + "err": "" +}