Fix granular formatting disable to allow for preceding blank lines.

PiperOrigin-RevId: 665341867
protocolbuffers · Aug 20, 2024 · 2549276 · 2549276
1 parent 0a5c94e
commit 2549276
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/parser/parser.go b/parser/parser.go
@@ -844,12 +844,7 @@ func (p *parser) readContinuousBlocksOfComments() []string {
 // within this block, and as parsing errors will be ignored, please exercise caution.
 func (p *parser) readFormatterDisabledBlock() (string, error) {
 	start := p.index
-	for p.consume('\n') {
-		// Consume blank lines.
-	}
 	if !p.consumeString("# txtpbfmt: off") {
-		// Directive not found. Rollback to start.
-		p.index = start
 		return "", nil
 	}
 	if !p.consume('\n') {

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -1478,7 +1478,6 @@ bar {
   should_format {
 foo:  "bar"
   }
-
 # txtpbfmt: off
       no_format {    foo:   "bar"  } # txtpbfmt: on
   should_format {
@@ -1500,7 +1499,6 @@ bar {
 should_format {
   foo: "bar"
 }
-
 # txtpbfmt: off
       no_format {    foo:   "bar"  } # txtpbfmt: on
 should_format {