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

d2oracle: fix deleting multiline object in board

Browse source
This commit is contained in:
Alexander Wang 2025-02-02 23:10:59 -07:00
parent 73d5942b08
commit 992e1a4b33
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
3 changed files with 324 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
d2ir/d2ir.go
View file

@ -1411,7 +1411,12 @@ func (f *Field) AST() d2ast.Node {
k.Primary = d2ast.MakeValueBox(f.Primary_.AST().(d2ast.Value)).ScalarBox()
}
if f.Composite != nil {
k.Value = d2ast.MakeValueBox(f.Composite.AST().(d2ast.Value))
value := f.Composite.AST().(d2ast.Value)
if m, ok := value.(*d2ast.Map); ok {
// Treat it as multi-line, but not file-map (line 0)
m.Range = d2ast.MakeRange(",1:0:0-2:0:0")
}
k.Value = d2ast.MakeValueBox(value)
}
return k

26
d2oracle/edit_test.go
View file

@ -8077,6 +8077,32 @@ y
y
(* -> *)[*].style.opacity: 0.8
`,
},
{
name: "layer-delete-complex-object",
text: `k
layers: {
x: {
a: "b" {
top: 184
left: 180
}
j
}
}
`,
key: `a`,
boardPath: []string{"x"},
exp: `k
layers: {
x: {
j
}
}
`,
},
}

292
testdata/d2oracle/TestDelete/layer-delete-complex-object.exp.json generated vendored Normal file
View file

@ -0,0 +1,292 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-7:0:32",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"value": [
{
"string": "k",
"raw_string": "k"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-6:1:31",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-2:6:9",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-2:6:9",
"value": [
{
"string": "layers",
"raw_string": "layers"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:8:11-6:1:31",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-5:3:29",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-3:3:16",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-3:3:16",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:5:18-5:3:29",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"value": [
{
"string": "j",
"raw_string": "j"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
]
}
}
}
}
]
}
}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "k",
"id_val": "k",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"value": [
{
"string": "k",
"raw_string": "k"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "k"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
],
"layers": [
{
"name": "x",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-1:0:0",
"nodes": [
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"value": [
{
"string": "j",
"raw_string": "j"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "j",
"id_val": "j",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"value": [
{
"string": "j",
"raw_string": "j"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "j"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
}
]
},
"err": "<nil>"
}