Litedown: skip the next auto line break when a forced line break is used

s9e · Jul 21, 2019 · 27f7090 · 27f7090
1 parent 8d6c632
commit 27f7090
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/docs/testdox.txt b/docs/testdox.txt
@@ -4784,6 +4784,8 @@ s9e\TextFormatter\Tests\Plugins\Litedown\Parser\Passes\ForcedLineBreaks
  [x] Parsing tests with data set #5
  [x] Parsing tests with data set #6
  [x] Parsing tests with data set #7
+ [x] Parsing tests with data set #8
+ [x] Parsing tests with data set #9
  [x] Parsing tests (JavaScript) with data set #0
  [x] Parsing tests (JavaScript) with data set #1
  [x] Parsing tests (JavaScript) with data set #2
@@ -4792,6 +4794,8 @@ s9e\TextFormatter\Tests\Plugins\Litedown\Parser\Passes\ForcedLineBreaks
  [x] Parsing tests (JavaScript) with data set #5
  [x] Parsing tests (JavaScript) with data set #6
  [x] Parsing tests (JavaScript) with data set #7
+ [x] Parsing tests (JavaScript) with data set #8
+ [x] Parsing tests (JavaScript) with data set #9
  [x] Parsing+rendering tests with data set #0
 
 s9e\TextFormatter\Tests\Plugins\Litedown\Parser\Passes\Images

diff --git a/src/Plugins/Litedown/Parser/Passes/ForcedLineBreaks.js b/src/Plugins/Litedown/Parser/Passes/ForcedLineBreaks.js
@@ -3,7 +3,9 @@ function parse()
 	var pos = text.indexOf("  \n");
 	while (pos > 0)
 	{
-		addBrTag(pos + 2);
+		addBrTag(pos + 2).cascadeInvalidationTo(
+			addVerbatim(pos + 2, 1)
+		);
 		pos = text.indexOf("  \n", pos + 3);
 	}
 }
diff --git a/src/Plugins/Litedown/Parser/Passes/ForcedLineBreaks.php b/src/Plugins/Litedown/Parser/Passes/ForcedLineBreaks.php
@@ -17,7 +17,9 @@ public function parse()
 		$pos = $this->text->indexOf("  \n");
 		while ($pos !== false)
 		{
-			$this->parser->addBrTag($pos + 2);
+			$this->parser->addBrTag($pos + 2)->cascadeInvalidationTo(
+				$this->parser->addVerbatim($pos + 2, 1)
+			);
 			$pos = $this->text->indexOf("  \n", $pos + 3);
 		}
 	}

diff --git a/tests/Plugins/Litedown/Parser/Passes/ForcedLineBreaksTest.php b/tests/Plugins/Litedown/Parser/Passes/ForcedLineBreaksTest.php
@@ -107,6 +107,38 @@ public function getParsingTests()
 					'<p>bar</p>  </r>'
 				]
 			],
+			[
+				[
+					'forced  ',
+					'linebreak'
+				],
+				[
+					'<t><p>forced  <br/>',
+					'linebreak</p></t>'
+				],
+				[],
+				function ($configurator)
+				{
+					$configurator->rootRules->enableAutoLineBreaks();
+				}
+			],
+			[
+				[
+					'forced  ',
+					'',
+					'linebreak'
+				],
+				[
+					'<t><p>forced</p>  ',
+					'',
+					'<p>linebreak</p></t>'
+				],
+				[],
+				function ($configurator)
+				{
+					$configurator->rootRules->enableAutoLineBreaks();
+				}
+			],
 		]);
 	}