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

rename + refactor

Browse source
This commit is contained in:
Bernard Xie 2023-06-19 17:39:05 -07:00
parent 9c0f49829a
commit fdb73c14b2
No known key found for this signature in database
GPG key ID: 3C3E0036CE0F892C
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
d2ast/d2ast.go
View file

@ -760,8 +760,8 @@ func (mb MapNodeBox) Unbox() MapNode {
}
}
func (mb MapNodeBox) IsSpecialBoard() bool {
if mb.MapKey == nil || mb.MapKey.Key == nil {
func (mb MapNodeBox) IsBoardNode() bool {
if mb.MapKey == nil || mb.MapKey.Key == nil || len(mb.MapKey.Key.Path) == 0 {
return false
}
switch mb.MapKey.Key.Path[0].Unbox().ScalarString() {

6
d2format/format.go
View file

@ -260,7 +260,7 @@ func (p *printer) _map(m *d2ast.Map) {
stepNodes := []d2ast.MapNodeBox{}
for i := 0; i < len(m.Nodes); i++ {
node := m.Nodes[i]
if node.MapKey != nil && node.MapKey.Key != nil {
if node.IsBoardNode() {
key := node.MapKey.Key
switch key.Path[0].Unbox().ScalarString() {
case "layers":
@ -269,8 +269,6 @@ func (p *printer) _map(m *d2ast.Map) {
scenarioNodes = append(scenarioNodes, node)
case "steps":
stepNodes = append(stepNodes, node)
default:
nodes = append(nodes, node)
}
} else {
nodes = append(nodes, node)
@ -309,7 +307,7 @@ func (p *printer) _map(m *d2ast.Map) {
p.sb.WriteString("; ")
}
if m.IsFileMap() && nb.IsSpecialBoard() {
if m.IsFileMap() && nb.IsBoardNode() {
currString := p.sb.String()
// if the the character before the special board is not a newline, we add one
if currString[len(currString)-2:] != "\n\n" {