code.ivysaur.me/php2go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

node: add heuristic for breaking array/map literals onto multiple lines

Browse Source
This commit is contained in:
mappu 2020-04-16 18:38:21 +12:00
parent fd59ff9bb4
commit a839ceaf30
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
node.go
View File

@ -2024,6 +2024,8 @@ func (this *conversionState) convertArrayLiteralCommon(items []node.Node) (strin
// TODO support unpack operator (...) // TODO support unpack operator (...)
nChars := 0
isMapType := false isMapType := false
for idx, itm_ := range items { for idx, itm_ := range items {
itm, ok := itm_.(*expr.ArrayItem) itm, ok := itm_.(*expr.ArrayItem)
@ -2057,16 +2059,26 @@ func (this *conversionState) convertArrayLiteralCommon(items []node.Node) (strin
return "", parseErr{itm, err} return "", parseErr{itm, err}
} }
entries = append(entries, kv+`: `+vv+`,`) entries = append(entries, kv+`: `+vv+`,`)
nChars += len(kv) + len(vv) + 4 // assume an extra trailing space
} else { } else {
entries = append(entries, vv+`,`) entries = append(entries, vv+`,`)
nChars += len(vv) + 2
} }
} }
// Heuristic decision whether to break array literal onto multiple lines
// We have to do this because gofmt does not care about long lines otherwise
maybeNewline := " "
if nChars > 60 {
maybeNewline = "\n"
}
if isMapType { if isMapType {
return `map[` + keyType.AsGoString() + `]` + valType.AsGoString() + `{` + strings.Join(entries, " ") + `}`, nil return `map[` + keyType.AsGoString() + `]` + valType.AsGoString() + `{` + maybeNewline + strings.Join(entries, maybeNewline) + maybeNewline + `}`, nil
} else { } else {
return `[]` + valType.AsGoString() + `{` + strings.Join(entries, " ") + `}`, nil return `[]` + valType.AsGoString() + `{` + maybeNewline + strings.Join(entries, maybeNewline) + maybeNewline + `}`, nil
} }
} }