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

update grid edge validation

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-12 16:07:57 -07:00
parent 2870725788
commit 5c50f41ce9
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
d2compiler/compile.go
View file

@ -1072,12 +1072,10 @@ func (c *compiler) validateNear(g *d2graph.Graph) {
func (c *compiler) validateEdges(g *d2graph.Graph) { func (c *compiler) validateEdges(g *d2graph.Graph) {
for _, edge := range g.Edges { for _, edge := range g.Edges {
if gd := edge.Src.Parent.ClosestGridDiagram(); gd != nil { srcGrid := edge.Src.Parent.ClosestGridDiagram()
c.errorf(edge.GetAstEdge(), "edges in grid diagrams are not supported yet") dstGrid := edge.Dst.Parent.ClosestGridDiagram()
continue if (srcGrid != nil || dstGrid != nil) && srcGrid != dstGrid {
} c.errorf(edge.GetAstEdge(), "edges into grid diagrams are not supported yet")
if gd := edge.Dst.Parent.ClosestGridDiagram(); gd != nil {
c.errorf(edge.GetAstEdge(), "edges in grid diagrams are not supported yet")
continue continue
} }
} }

5
d2compiler/compile_test.go
View file

@ -2483,9 +2483,8 @@ d2/testdata/d2compiler/TestCompile/grid_gap_negative.d2:3:16: vertical-gap must
hey -> c: ok hey -> c: ok
`, `,
expErr: `d2/testdata/d2compiler/TestCompile/grid_edge.d2:3:2: edges in grid diagrams are not supported yet expErr: `d2/testdata/d2compiler/TestCompile/grid_edge.d2:5:2: edges into grid diagrams are not supported yet
d2/testdata/d2compiler/TestCompile/grid_edge.d2:5:2: edges in grid diagrams are not supported yet d2/testdata/d2compiler/TestCompile/grid_edge.d2:6:2: edges into grid diagrams are not supported yet`,
d2/testdata/d2compiler/TestCompile/grid_edge.d2:6:2: edges in grid diagrams are not supported yet`,
}, },
{ {
name: "grid_nested", name: "grid_nested",

8
testdata/d2compiler/TestCompile/grid_edge.exp.json generated vendored
View file

@ -2,17 +2,13 @@
"graph": null, "graph": null,
"err": { "err": {
"errs": [ "errs": [
{
"range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,2:1:22-2:7:28",
"errmsg": "d2/testdata/d2compiler/TestCompile/grid_edge.d2:3:2: edges in grid diagrams are not supported yet"
},
{ {
"range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,4:1:32-4:11:42", "range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,4:1:32-4:11:42",
"errmsg": "d2/testdata/d2compiler/TestCompile/grid_edge.d2:5:2: edges in grid diagrams are not supported yet" "errmsg": "d2/testdata/d2compiler/TestCompile/grid_edge.d2:5:2: edges into grid diagrams are not supported yet"
}, },
{ {
"range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,5:1:44-5:11:54", "range": "d2/testdata/d2compiler/TestCompile/grid_edge.d2,5:1:44-5:11:54",
"errmsg": "d2/testdata/d2compiler/TestCompile/grid_edge.d2:6:2: edges in grid diagrams are not supported yet" "errmsg": "d2/testdata/d2compiler/TestCompile/grid_edge.d2:6:2: edges into grid diagrams are not supported yet"
} }
] ]
} }