hclwrite: Fix a bug that Block.open/close positions were not recorded…

… in parser

While implementing Block.SetLabels(), I found a new hclwrite parser bug.

The NewBlock() method records positions of TokenOBrace / TokenCBrace.
Nevertheless when generating blocks via hclwrite.ParseConfig(),
they were not recorded.

The position of TokenOBrace is needed for Block.SetLabels(),
so I also fixed this existing bug.

hclwrite/parser.go

@@ -329,7 +329,7 @@ func parseBlock(nativeBlock *hclsyntax.Block, from, leadComments, lineComments,
 
  before, oBrace, from := from.Partition(nativeBlock.OpenBraceRange)
  children.AppendUnstructuredTokens(before.Tokens())
- children.AppendUnstructuredTokens(oBrace.Tokens())
+ block.open = children.AppendUnstructuredTokens(oBrace.Tokens())
 
  // We go a bit out of order here: we go hunting for the closing brace
  // so that we have a delimited body, but then we'll deal with the body
@@ -342,7 +342,7 @@ func parseBlock(nativeBlock *hclsyntax.Block, from, leadComments, lineComments,
  children.AppendNode(body)
  children.AppendUnstructuredTokens(after.Tokens())
 
- children.AppendUnstructuredTokens(cBrace.Tokens())
+ block.close = children.AppendUnstructuredTokens(cBrace.Tokens())
 
  // stragglers
  children.AppendUnstructuredTokens(from.Tokens())