luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix renameiddelta

Browse source
This commit is contained in:
Alexander Wang 2023-06-01 19:42:40 -07:00
parent e40a65ae79
commit e6750a99b6
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
3 changed files with 217 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
d2oracle/edit.go
View file

@ -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
}
}
}
}

24
d2oracle/edit_test.go
View file

@ -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",

180
testdata/d2oracle/TestRename/generated-conflict.exp.json generated vendored Normal file
View file

@ -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": "<nil>"
}