fix d2oracle.set on imported edge
This commit is contained in:
parent
3129df1c02
commit
706951b85b
3 changed files with 15 additions and 37 deletions
|
|
@ -476,14 +476,14 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string)
|
||||||
appendMapKey(scope, mk)
|
appendMapKey(scope, mk)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// TODO what if the edge is imported, how does this work?
|
|
||||||
var ok bool
|
var ok bool
|
||||||
edge, ok = obj.HasEdge(mk)
|
edge, ok = obj.HasEdge(mk)
|
||||||
if !ok {
|
if !ok {
|
||||||
return errors.New("edge not found")
|
return errors.New("edge not found")
|
||||||
}
|
}
|
||||||
|
imported = IsImportedEdge(baseAST, edge)
|
||||||
refs := edge.References
|
refs := edge.References
|
||||||
if baseAST != g.AST {
|
if baseAST != g.AST || imported {
|
||||||
refs = getWriteableEdgeRefs(edge, baseAST)
|
refs = getWriteableEdgeRefs(edge, baseAST)
|
||||||
}
|
}
|
||||||
onlyInChain := true
|
onlyInChain := true
|
||||||
|
|
|
||||||
|
|
@ -2181,10 +2181,10 @@ layers: {
|
||||||
fsTexts: map[string]string{
|
fsTexts: map[string]string{
|
||||||
"yo.d2": `a -> b`,
|
"yo.d2": `a -> b`,
|
||||||
},
|
},
|
||||||
key: `(a -> b).style.stroke`,
|
key: `(a -> b)[0].style.stroke`,
|
||||||
value: go2.Pointer(`red`),
|
value: go2.Pointer(`red`),
|
||||||
exp: `...@yo
|
exp: `...@yo
|
||||||
(a -> b).style.stroke: red
|
(a -> b)[0].style.stroke: red
|
||||||
`,
|
`,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
44
testdata/d2oracle/TestSet/import/9.exp.json
generated
vendored
44
testdata/d2oracle/TestSet/import/9.exp.json
generated
vendored
|
|
@ -3,7 +3,7 @@
|
||||||
"name": "",
|
"name": "",
|
||||||
"isFolderOnly": false,
|
"isFolderOnly": false,
|
||||||
"ast": {
|
"ast": {
|
||||||
"range": "index.d2,0:0:0-2:0:34",
|
"range": "index.d2,0:0:0-2:0:37",
|
||||||
"nodes": [
|
"nodes": [
|
||||||
{
|
{
|
||||||
"import": {
|
"import": {
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"map_key": {
|
"map_key": {
|
||||||
"range": "index.d2,1:0:7-1:26:33",
|
"range": "index.d2,1:0:7-1:29:36",
|
||||||
"edges": [
|
"edges": [
|
||||||
{
|
{
|
||||||
"range": "index.d2,1:1:8-1:7:14",
|
"range": "index.d2,1:1:8-1:7:14",
|
||||||
|
|
@ -67,12 +67,17 @@
|
||||||
"dst_arrow": ">"
|
"dst_arrow": ">"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"edge_index": {
|
||||||
|
"range": "index.d2,1:8:15-1:11:18",
|
||||||
|
"int": 0,
|
||||||
|
"glob": false
|
||||||
|
},
|
||||||
"edge_key": {
|
"edge_key": {
|
||||||
"range": "index.d2,1:9:16-1:21:28",
|
"range": "index.d2,1:12:19-1:24:31",
|
||||||
"path": [
|
"path": [
|
||||||
{
|
{
|
||||||
"unquoted_string": {
|
"unquoted_string": {
|
||||||
"range": "index.d2,1:9:16-1:14:21",
|
"range": "index.d2,1:12:19-1:17:24",
|
||||||
"value": [
|
"value": [
|
||||||
{
|
{
|
||||||
"string": "style",
|
"string": "style",
|
||||||
|
|
@ -83,7 +88,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"unquoted_string": {
|
"unquoted_string": {
|
||||||
"range": "index.d2,1:15:22-1:21:28",
|
"range": "index.d2,1:18:25-1:24:31",
|
||||||
"value": [
|
"value": [
|
||||||
{
|
{
|
||||||
"string": "stroke",
|
"string": "stroke",
|
||||||
|
|
@ -97,7 +102,7 @@
|
||||||
"primary": {},
|
"primary": {},
|
||||||
"value": {
|
"value": {
|
||||||
"unquoted_string": {
|
"unquoted_string": {
|
||||||
"range": "index.d2,1:23:30-1:26:33",
|
"range": "index.d2,1:26:33-1:29:36",
|
||||||
"value": [
|
"value": [
|
||||||
{
|
{
|
||||||
"string": "red",
|
"string": "red",
|
||||||
|
|
@ -142,34 +147,7 @@
|
||||||
"references": [
|
"references": [
|
||||||
{
|
{
|
||||||
"map_key_edge_index": 0
|
"map_key_edge_index": 0
|
||||||
}
|
|
||||||
],
|
|
||||||
"attributes": {
|
|
||||||
"label": {
|
|
||||||
"value": ""
|
|
||||||
},
|
},
|
||||||
"labelDimensions": {
|
|
||||||
"width": 0,
|
|
||||||
"height": 0
|
|
||||||
},
|
|
||||||
"style": {},
|
|
||||||
"near_key": null,
|
|
||||||
"shape": {
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
"direction": {
|
|
||||||
"value": ""
|
|
||||||
},
|
|
||||||
"constraint": null
|
|
||||||
},
|
|
||||||
"zIndex": 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"index": 1,
|
|
||||||
"isCurve": false,
|
|
||||||
"src_arrow": false,
|
|
||||||
"dst_arrow": true,
|
|
||||||
"references": [
|
|
||||||
{
|
{
|
||||||
"map_key_edge_index": 0
|
"map_key_edge_index": 0
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue