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

updating validation

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-28 18:08:49 -07:00
parent 016ff3723d
commit 97488fe2d8
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
d2compiler/compile.go
View file

@ -1081,7 +1081,7 @@ func (c *compiler) validateNear(g *d2graph.Graph) {
} }
if (isSrcNearConst || isDstNearConst) && srcNearContainer != dstNearContainer { if (isSrcNearConst || isDstNearConst) && srcNearContainer != dstNearContainer {
c.errorf(edge.References[0].Edge, "cannot connect objects from within a container, that has near constant set, to objects outside that container") // c.errorf(edge.References[0].Edge, "cannot connect objects from within a container, that has near constant set, to objects outside that container")
} }
} }
@ -1101,6 +1101,14 @@ func (c *compiler) validateEdges(g *d2graph.Graph) {
c.errorf(edge.GetAstEdge(), "edge from grid diagram %#v cannot enter itself", edge.Dst.AbsID()) c.errorf(edge.GetAstEdge(), "edge from grid diagram %#v cannot enter itself", edge.Dst.AbsID())
continue continue
} }
if edge.Src.Parent.IsGridDiagram() && edge.Dst.IsDescendantOf(edge.Src) {
c.errorf(edge.GetAstEdge(), "edge from grid cell %#v cannot enter itself", edge.Src.AbsID())
continue
}
if edge.Dst.Parent.IsGridDiagram() && edge.Src.IsDescendantOf(edge.Dst) {
c.errorf(edge.GetAstEdge(), "edge from grid cell %#v cannot enter itself", edge.Dst.AbsID())
continue
}
srcGrid := edge.Src.Parent.ClosestGridDiagram() srcGrid := edge.Src.Parent.ClosestGridDiagram()
dstGrid := edge.Dst.Parent.ClosestGridDiagram() dstGrid := edge.Dst.Parent.ClosestGridDiagram()