Incremental improvement to granular disabling directive.

PiperOrigin-RevId: 666695192
protocolbuffers · Aug 23, 2024 · 8e6b51f · 8e6b51f
1 parent e3b1504
commit 8e6b51f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/parser/parser.go b/parser/parser.go
@@ -876,6 +876,8 @@ func (p *parser) readFormatterDisabledBlock() (string, error) {
 			if !p.consume('\n') {
 				return "", fmt.Errorf("txtpbfmt on should be followed by newline at %s", p.errorContext())
 			}
+			// Retain up to one blank line.
+			p.consume('\n')
 			return string(p.in[start:p.index]), nil
 		}
 	}

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -1476,6 +1476,8 @@ bar {
 }
       enabled: {TEMPLATE_plx}
 # txtpbfmt: on
+
+
 }
   should_format {
 foo:  "bar"
@@ -1502,6 +1504,7 @@ bar {
 }
       enabled: {TEMPLATE_plx}
 # txtpbfmt: on
+
 }
 should_format {
   foo: "bar"