Fix granular formatting disable to allow for preceding blank lines.

PiperOrigin-RevId: 664785820
protocolbuffers · Aug 19, 2024 · 0a5c94e · 0a5c94e
1 parent a619d35
commit 0a5c94e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/parser/parser.go b/parser/parser.go
@@ -844,7 +844,12 @@ 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,6 +1478,7 @@ bar {
   should_format {
 foo:  "bar"
   }
+
 # txtpbfmt: off
       no_format {    foo:   "bar"  } # txtpbfmt: on
   should_format {
@@ -1499,6 +1500,7 @@ bar {
 should_format {
   foo: "bar"
 }
+
 # txtpbfmt: off
       no_format {    foo:   "bar"  } # txtpbfmt: on
 should_format {