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

refactor

Browse source
This commit is contained in:
Gavin Nishizawa 2022-12-05 13:15:43 -08:00
parent 5b5f9e0923
commit f5d46b0584
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
d2layouts/d2dagrelayout/layout.go
View file

@ -136,9 +136,6 @@ func Layout(ctx context.Context, g *d2graph.Graph) (err error) {
if err := json.Unmarshal([]byte(val.String()), &dn); err != nil { if err := json.Unmarshal([]byte(val.String()), &dn); err != nil {
return err return err
} }
// ID "ninety\nnine" is set in dagre with backticks: g.setNode(`"ninety\nnine"`, ...)
// but unmarshal converts \n into an actual newline, so we need to replace these to get the AbsID string and lookup the node
dn.ID = strings.ReplaceAll(dn.ID, "\n", "\\n")
if debugJS { if debugJS {
log.Debug(ctx, "graph", slog.F("json", dn)) log.Debug(ctx, "graph", slog.F("json", dn))
} }
@ -260,8 +257,10 @@ func setGraphAttrs(attrs dagreGraphAttrs) string {
} }
func escapeID(id string) string { func escapeID(id string) string {
// an unescaped \r will become a \n in the layout result id = strings.ReplaceAll(id, "\\n", "\\\\n")
return strings.ReplaceAll(id, "\r", "\\r") // avoid an unescaped \r becoming a \n in the layout result
id = strings.ReplaceAll(id, "\r", "\\r")
return id
} }
func generateAddNodeLine(id string, width, height int) string { func generateAddNodeLine(id string, width, height int) string {