From 3af52f0e4baaf236be3606927186e9debf8323b3 Mon Sep 17 00:00:00 2001
From: iseulde <wp@iseulde.com>
Date: Wed, 27 Mar 2019 09:24:56 +0100
Subject: [PATCH 1/2] Preformatted: save line breaks as characters

---
 packages/block-library/src/preformatted/index.js            | 6 +++++-
 .../specs/blocks/__snapshots__/preformatted.test.js.snap    | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/preformatted/index.js b/packages/block-library/src/preformatted/index.js
index 7d90224f9639cd..9553ac77885f98 100644
--- a/packages/block-library/src/preformatted/index.js
+++ b/packages/block-library/src/preformatted/index.js
@@ -68,10 +68,14 @@ export const settings = {
 		return (
 			<RichText
 				tagName="pre"
+				// Ensure line breaks are normalised to HTML.
 				value={ content.replace( /\n/g, '<br>' ) }
 				onChange={ ( nextContent ) => {
 					setAttributes( {
-						content: nextContent,
+						// Ensure line breaks are normalised to characters. This
+						// saves space, is easier to read, and ensures display
+						// filters work correctly.
+						content: nextContent.replace( /<br ?\/?>/g, '\n' ),
 					} );
 				} }
 				placeholder={ __( 'Write preformatted text…' ) }
diff --git a/packages/e2e-tests/specs/blocks/__snapshots__/preformatted.test.js.snap b/packages/e2e-tests/specs/blocks/__snapshots__/preformatted.test.js.snap
index 4538816e15b411..07a70a19a6b2be 100644
--- a/packages/e2e-tests/specs/blocks/__snapshots__/preformatted.test.js.snap
+++ b/packages/e2e-tests/specs/blocks/__snapshots__/preformatted.test.js.snap
@@ -9,6 +9,8 @@ exports[`Preformatted should preserve character newlines 1`] = `
 
 exports[`Preformatted should preserve character newlines 2`] = `
 "<!-- wp:preformatted -->
-<pre class=\\"wp-block-preformatted\\">0<br>1<br>2</pre>
+<pre class=\\"wp-block-preformatted\\">0
+1
+2</pre>
 <!-- /wp:preformatted -->"
 `;

From a57ee67115d88316637e2e632774de082c01b97f Mon Sep 17 00:00:00 2001
From: iseulde <wp@iseulde.com>
Date: Wed, 27 Mar 2019 14:15:59 +0100
Subject: [PATCH 2/2] Update e2e test

---
 .../e2e-tests/specs/__snapshots__/adding-blocks.test.js.snap  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/e2e-tests/specs/__snapshots__/adding-blocks.test.js.snap b/packages/e2e-tests/specs/__snapshots__/adding-blocks.test.js.snap
index 30b83349a7030a..b8160cb3842efc 100644
--- a/packages/e2e-tests/specs/__snapshots__/adding-blocks.test.js.snap
+++ b/packages/e2e-tests/specs/__snapshots__/adding-blocks.test.js.snap
@@ -42,7 +42,9 @@ exports[`adding blocks Should insert content using the placeholder and the regul
 <!-- /wp:quote -->
 
 <!-- wp:preformatted -->
-<pre class=\\"wp-block-preformatted\\">Pre text<br><br>Foo</pre>
+<pre class=\\"wp-block-preformatted\\">Pre text
+
+Foo</pre>
 <!-- /wp:preformatted -->
 
 <!-- wp:shortcode -->