Recognize \r as a valid space separator

PiperOrigin-RevId: 695757909
protocolbuffers · Nov 12, 2024 · 20d2c9e · 20d2c9e
1 parent 5c07d7c
commit 20d2c9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/parser/parser.go b/parser/parser.go
@@ -304,8 +304,8 @@ func removeDeleted(nodes []*ast.Node) []*ast.Node {
 }
 
 var (
-	spaceSeparators = []byte(" \t\n")
-	valueSeparators = []byte(" \t\n{}:,[]<>;#")
+	spaceSeparators = []byte(" \t\n\r")
+	valueSeparators = []byte(" \t\n\r{}:,[]<>;#")
 )
 
 // Parse returns a tree representation of a textproto file.

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -1531,7 +1531,13 @@ a, b,
   c
   # txtpbfmt: on
 ]
-`}}
+`}, {
+		name: "carriage return \\r is formatted away",
+		in:   `foo: "bar"` + "\r" + `baz: "bat"` + "\r",
+		out:  `foo: "bar"` + "\n" + `baz: "bat"` + "\n"}, {
+		name: "Windows-style newline \\r\\n is formatted away",
+		in:   `foo: "bar"` + "\r\n" + `baz: "bat"` + "\r\n",
+		out:  `foo: "bar"` + "\n" + `baz: "bat"` + "\n"}}
 	for _, input := range inputs {
 		out, err := Format([]byte(input.in))
 		if err != nil {