go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #85 from VladRassokhin/fix-list-comments-indent

Browse Source 
Fix indent of list item comments
This commit is contained in:
Mitchell Hashimoto 2016-02-07 10:45:49 -08:00
commit a01f759c89
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hcl/printer/nodes.go
View File

@ -434,12 +434,8 @@ func (p *printer) list(l *ast.ListType) []byte {
if lit, ok := item.(*ast.LiteralType); ok && lit.LineComment != nil { if lit, ok := item.(*ast.LiteralType); ok && lit.LineComment != nil {
// if the next item doesn't have any comments, do not align // if the next item doesn't have any comments, do not align
buf.WriteByte(blank) // align one space buf.WriteByte(blank) // align one space
if i != len(l.List)-1 { for i := 0; i < longestLine-curLen; i++ {
if lit, ok := l.List[i+1].(*ast.LiteralType); ok && lit.LineComment != nil { buf.WriteByte(blank)
for i := 0; i < longestLine-curLen; i++ {
buf.WriteByte(blank)
}
}
} }
for _, comment := range lit.LineComment.List { for _, comment := range lit.LineComment.List {

7
hcl/printer/testdata/comment_aligned.golden vendored
View File

@ -22,4 +22,11 @@ aligned {
"foo", # kenya 1 "foo", # kenya 1
"${aws_security_group.firewall.foo}", # kenya 2 "${aws_security_group.firewall.foo}", # kenya 2
] ]
security_groups2 = [
"foo", # kenya 1
"bar", # kenya 1.5
"${aws_security_group.firewall.foo}", # kenya 2
"foobar", # kenya 3
]
} }

7
hcl/printer/testdata/comment_aligned.input vendored
View File

@ -18,4 +18,11 @@ security_groups = [
"foo", # kenya 1 "foo", # kenya 1
"${aws_security_group.firewall.foo}", # kenya 2 "${aws_security_group.firewall.foo}", # kenya 2
] ]
security_groups2 = [
"foo", # kenya 1
"bar", # kenya 1.5
"${aws_security_group.firewall.foo}", # kenya 2
"foobar", # kenya 3
]
} }