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

fix delete not saving map

Browse source
This commit is contained in:
Alexander Wang 2023-03-04 00:40:12 -08:00
parent d6e501419d
commit e1b9a227c4
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
3 changed files with 164 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
d2oracle/edit.go
View file

@ -927,10 +927,11 @@ func deleteObject(g *d2graph.Graph, key *d2ast.KeyPath, obj *d2graph.Object) (*d
len(obj.Parent.References) > 1 { len(obj.Parent.References) > 1 {
// Redundant key. // Redundant key.
deleteFromMap(ref.Scope, ref.MapKey) deleteFromMap(ref.Scope, ref.MapKey)
} else if ref.MapKey.Value.Map != nil { } else if ref.MapKey.Value.Map != nil && isSuffix {
for i := 0; i < len(ref.MapKey.Value.Map.Nodes); i++ { for i := 0; i < len(ref.MapKey.Value.Map.Nodes); i++ {
n := ref.MapKey.Value.Map.Nodes[i] n := ref.MapKey.Value.Map.Nodes[i]
if n.MapKey != nil && n.MapKey.Key != nil { if n.MapKey != nil && n.MapKey.Key != nil {
println("\033[1;31m--- DEBUG:", "=======================", "\033[m")
_, ok := d2graph.ReservedKeywords[n.MapKey.Key.Path[0].Unbox().ScalarString()] _, ok := d2graph.ReservedKeywords[n.MapKey.Key.Path[0].Unbox().ScalarString()]
if ok { if ok {
deleteFromMap(ref.MapKey.Value.Map, n.MapKey) deleteFromMap(ref.MapKey.Value.Map, n.MapKey)

13
d2oracle/edit_test.go
View file

@ -4862,6 +4862,19 @@ Text 2
key: `a.b.c`, key: `a.b.c`,
exp: `a.b exp: `a.b
`,
},
{
name: "save_map",
text: `a.b: {
shape: circle
}
`,
key: `a`,
exp: `b: {
shape: circle
}
`, `,
}, },
{ {

149
testdata/d2oracle/TestDelete/save_map.exp.json generated vendored Normal file
View file

@ -0,0 +1,149 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-3:0:23",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-2:1:22",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:3:3-2:0:21",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:15:20",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:7:12",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:2:7-1:7:12",
"value": [
{
"string": "shape",
"raw_string": "shape"
}
]
}
}
]
},
"primary": {},
"value": {
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:9:14-1:15:20",
"value": [
{
"string": "circle",
"raw_string": "circle"
}
]
}
}
}
}
]
}
}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"label_dimensions": {
"width": 0,
"height": 0
},
"attributes": {
"label": {
"value": ""
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "b",
"id_val": "b",
"label_dimensions": {
"width": 0,
"height": 0
},
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/save_map.d2,0:0:0-0:1:1",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "b"
},
"style": {},
"near_key": null,
"shape": {
"value": "circle"
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
}
]
},
"err": "<nil>"
}