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

fix notes identifying as spans

Browse source
This commit is contained in:
Alexander Wang 2022-12-04 13:40:46 -08:00
parent a4e66f658a
commit c2825e401f
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
d2layouts/d2sequence/sequence_diagram.go
View file

@ -70,6 +70,22 @@ func hasEdge(o *d2graph.Object) bool {
return false return false
} }
func (sd *sequenceDiagram) containsMessage(o *d2graph.Object) bool {
for _, m := range sd.messages {
for _, ref := range m.References {
curr := ref.ScopeObj
for curr != nil {
if curr == o {
return true
}
curr = curr.Parent
}
}
}
return false
}
func newSequenceDiagram(actors []*d2graph.Object, messages []*d2graph.Edge) *sequenceDiagram { func newSequenceDiagram(actors []*d2graph.Object, messages []*d2graph.Edge) *sequenceDiagram {
sd := &sequenceDiagram{ sd := &sequenceDiagram{
messages: messages, messages: messages,
@ -104,8 +120,8 @@ func newSequenceDiagram(actors []*d2graph.Object, messages []*d2graph.Edge) *seq
queue = queue[1:] queue = queue[1:]
// spans are children of actors that have edges // spans are children of actors that have edges
// notes are children of actors with no edges // notes are children of actors with no edges and contains no messages
if hasEdge(child) { if hasEdge(child) && !sd.containsMessage(child) {
// spans have no labels // spans have no labels
// TODO why not? Spans should be able to // TODO why not? Spans should be able to
child.Attributes.Label = d2graph.Scalar{Value: ""} child.Attributes.Label = d2graph.Scalar{Value: ""}

2
testdata/d2compiler/TestCompile/leaky_sequence.exp.json generated vendored
View file

@ -5,7 +5,7 @@
"errs": [ "errs": [
{ {
"range": "d2/testdata/d2compiler/TestCompile/leaky_sequence.d2,4:0:36-4:8:44", "range": "d2/testdata/d2compiler/TestCompile/leaky_sequence.d2,4:0:36-4:8:44",
"errmsg": "d2/testdata/d2compiler/TestCompile/leaky_sequence.d2:5:1: connections within sequence diagrams can only connect to other objects within the same sequence diagram" "errmsg": "d2/testdata/d2compiler/TestCompile/leaky_sequence.d2:5:1: connections within sequence diagrams can connect only to other objects within the same sequence diagram"
} }
] ]
} }