From 27e7005e2b918376980fbe0caaa3314d8f049571 Mon Sep 17 00:00:00 2001 From: txtpbfmt team Date: Fri, 3 Mar 2023 06:56:36 -0800 Subject: [PATCH] internal (only required due to changes to txtpbfmt in diffbase) PiperOrigin-RevId: 513816470 --- parser/parser.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/parser/parser.go b/parser/parser.go index 78dd3c9..a471bb2 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -668,10 +668,10 @@ func (p *parser) parse(isRoot bool) (result []*ast.Node, endPos ast.Position, er p.config.infof("name: %q", nd.Name) } // Skip separator. - _, _ = p.skipWhiteSpaceAndReadComments(true /* multiLine */) + preCommentsBeforeColon, _ := p.skipWhiteSpaceAndReadComments(true /* multiLine */) nd.SkipColon = !p.consume(':') previousPos := p.position() - _, _ = p.skipWhiteSpaceAndReadComments(true /* multiLine */) + preCommentsAfterColon, _ := p.skipWhiteSpaceAndReadComments(true /* multiLine */) if p.consume('{') || p.consume('<') { if p.config.SkipAllColons { @@ -692,7 +692,12 @@ func (p *parser) parse(isRoot bool) (result []*ast.Node, endPos ast.Position, er openBracketLine := p.line // Skip separator. - preComments := p.readContinuousBlocksOfComments() + preCommentsAfterListStart := p.readContinuousBlocksOfComments() + + var preComments []string + preComments = append(preComments, preCommentsBeforeColon...) + preComments = append(preComments, preCommentsAfterColon...) + preComments = append(preComments, preCommentsAfterListStart...) if p.nextInputIs('{') { // Handle list of nodes.