diff --git a/src/markup/engine/__tests__/PhutilRemarkupEngineTestCase.php b/src/markup/engine/__tests__/PhutilRemarkupEngineTestCase.php index 4cae6ac..139b241 100644 --- a/src/markup/engine/__tests__/PhutilRemarkupEngineTestCase.php +++ b/src/markup/engine/__tests__/PhutilRemarkupEngineTestCase.php @@ -1,87 +1,88 @@ markupText($root.$file); } } private function markupText($markup_file) { $contents = Filesystem::readFile($markup_file); $file = basename($markup_file); $parts = explode("\n~~~~~~~~~~\n", $contents); $this->assertEqual(2, count($parts)); list($input_remarkup, $expected_output) = $parts; + $expected_output = preg_replace('/\n\z/', '', $expected_output); switch ($file) { case 'raw-escape.txt': // NOTE: Here, we want to test PhutilRemarkupRuleEscapeRemarkup and // PhutilRemarkupBlockStorage, which are triggered by "\1". In the // test, "~" is used as a placeholder for "\1" since it's hard to type // "\1". $input_remarkup = str_replace("~", "\1", $input_remarkup); $expected_output = str_replace("~", "\1", $expected_output); break; } $engine = $this->buildNewTestEngine(); $actual_output = $engine->markupText($input_remarkup); $this->assertEqual( $expected_output, $actual_output, "Failed to markup file '{$file}'."); } private function buildNewTestEngine() { $engine = new PhutilRemarkupEngine(); $engine->setConfig( 'uri.allowed-protocols', array( 'http' => true, )); $rules = array(); $rules[] = new PhutilRemarkupRuleEscapeRemarkup(); $rules[] = new PhutilRemarkupRuleMonospace(); $rules[] = new PhutilRemarkupRuleDocumentLink(); $rules[] = new PhutilRemarkupRuleHyperlink(); $rules[] = new PhutilRemarkupRuleEscapeHTML(); $rules[] = new PhutilRemarkupRuleBold(); $rules[] = new PhutilRemarkupRuleItalic(); $rules[] = new PhutilRemarkupRuleDel(); $blocks = array(); $blocks[] = new PhutilRemarkupEngineRemarkupHeaderBlockRule(); $blocks[] = new PhutilRemarkupEngineRemarkupListBlockRule(); $blocks[] = new PhutilRemarkupEngineRemarkupCodeBlockRule(); $blocks[] = new PhutilRemarkupEngineRemarkupNoteBlockRule(); $blocks[] = new PhutilRemarkupEngineRemarkupSimpleTableBlockRule(); $blocks[] = new PhutilRemarkupEngineRemarkupDefaultBlockRule(); foreach ($blocks as $block) { if (!($block instanceof PhutilRemarkupEngineRemarkupCodeBlockRule)) { $block->setMarkupRules($rules); } } $engine->setBlockRules($blocks); return $engine; } } diff --git a/src/markup/engine/__tests__/remarkup/across-newlines.txt b/src/markup/engine/__tests__/remarkup/across-newlines.txt index bf81fd6..004ff75 100644 --- a/src/markup/engine/__tests__/remarkup/across-newlines.txt +++ b/src/markup/engine/__tests__/remarkup/across-newlines.txt @@ -1,5 +1,5 @@ **duck quack** ~~~~~~~~~~

duck -quack

\ No newline at end of file +quack

diff --git a/src/markup/engine/__tests__/remarkup/block-then-list.txt b/src/markup/engine/__tests__/remarkup/block-then-list.txt index ef2e70e..0d8f2fe 100644 --- a/src/markup/engine/__tests__/remarkup/block-then-list.txt +++ b/src/markup/engine/__tests__/remarkup/block-then-list.txt @@ -1,8 +1,8 @@ lang=txt code block - still a code block ~~~~~~~~~~
code block
 
-- still a code block
\ No newline at end of file +- still a code block diff --git a/src/markup/engine/__tests__/remarkup/del.txt b/src/markup/engine/__tests__/remarkup/del.txt index f8d3224..e7ac20d 100644 --- a/src/markup/engine/__tests__/remarkup/del.txt +++ b/src/markup/engine/__tests__/remarkup/del.txt @@ -1,9 +1,9 @@ omg~~ wtf~~~~~ bbq~~~ lol~~ ~~deleted text~~ ~~This is a great idea~~~ die forever please ~~~~~~ ~~~~~~~~~~

omg~~ wtf~~~~~ bbq~~~ lol~~ deleted text This is a great idea~ die forever please -~~~~~~

\ No newline at end of file +~~~~~~

diff --git a/src/markup/engine/__tests__/remarkup/diff.txt b/src/markup/engine/__tests__/remarkup/diff.txt index 4bd0478..71397e6 100644 --- a/src/markup/engine/__tests__/remarkup/diff.txt +++ b/src/markup/engine/__tests__/remarkup/diff.txt @@ -1,24 +1,24 @@ here is a diff lang=diff @@ derp derp @@ x y - x - y + z derp derp ~~~~~~~~~~

here is a diff

@@ derp derp @@
 x
 y
 
 - x
 - y
 + z
-

derp derp

\ No newline at end of file +

derp derp

diff --git a/src/markup/engine/__tests__/remarkup/disallowed-link.txt b/src/markup/engine/__tests__/remarkup/disallowed-link.txt index d3ecd25..3cf9ba1 100644 --- a/src/markup/engine/__tests__/remarkup/disallowed-link.txt +++ b/src/markup/engine/__tests__/remarkup/disallowed-link.txt @@ -1,3 +1,3 @@ javascript://www.example.com/ ~~~~~~~~~~ -

javascript://www.example.com/

\ No newline at end of file +

javascript://www.example.com/

diff --git a/src/markup/engine/__tests__/remarkup/entities.txt b/src/markup/engine/__tests__/remarkup/entities.txt index 1fb18a2..6e75f27 100644 --- a/src/markup/engine/__tests__/remarkup/entities.txt +++ b/src/markup/engine/__tests__/remarkup/entities.txt @@ -1,3 +1,3 @@ < > & " ~~~~~~~~~~ -

< > & "

\ No newline at end of file +

< > & "

diff --git a/src/markup/engine/__tests__/remarkup/headers.txt b/src/markup/engine/__tests__/remarkup/headers.txt index f011bca..1e1fe56 100644 --- a/src/markup/engine/__tests__/remarkup/headers.txt +++ b/src/markup/engine/__tests__/remarkup/headers.txt @@ -1,12 +1,12 @@ =a= blah blah blah = b = ~~~~~~~~~~

a

blah blah blah

-

b

\ No newline at end of file +

b

diff --git a/src/markup/engine/__tests__/remarkup/leading-newline.txt b/src/markup/engine/__tests__/remarkup/leading-newline.txt index f8ba33b..3871eb8 100644 --- a/src/markup/engine/__tests__/remarkup/leading-newline.txt +++ b/src/markup/engine/__tests__/remarkup/leading-newline.txt @@ -1,4 +1,4 @@ a ~~~~~~~~~~ -

a

\ No newline at end of file +

a

diff --git a/src/markup/engine/__tests__/remarkup/link-brackets.txt b/src/markup/engine/__tests__/remarkup/link-brackets.txt index 407d1d4..82c631d 100644 --- a/src/markup/engine/__tests__/remarkup/link-brackets.txt +++ b/src/markup/engine/__tests__/remarkup/link-brackets.txt @@ -1,3 +1,3 @@ ~~~~~~~~~~ -

http://www.zany.com/omg/space url/

\ No newline at end of file +

http://www.zany.com/omg/space url/

diff --git a/src/markup/engine/__tests__/remarkup/link-edge-cases.txt b/src/markup/engine/__tests__/remarkup/link-edge-cases.txt index 08ffeb9..fc600de 100644 --- a/src/markup/engine/__tests__/remarkup/link-edge-cases.txt +++ b/src/markup/engine/__tests__/remarkup/link-edge-cases.txt @@ -1,23 +1,23 @@ http://www.example.com/ (http://www.example.com/) http://www.example.com/wiki/example_(disambiguation) (example http://www.example.com/) Quick! http://www.example.com/! ~~~~~~~~~~

http://www.example.com/

(http://www.example.com/)

http://www.example.com/

http://www.example.com/wiki/example_(disambiguation)

(example http://www.example.com/)

-

Quick! http://www.example.com/!

\ No newline at end of file +

Quick! http://www.example.com/!

diff --git a/src/markup/engine/__tests__/remarkup/link-square.txt b/src/markup/engine/__tests__/remarkup/link-square.txt index 63df4da..0864ab4 100644 --- a/src/markup/engine/__tests__/remarkup/link-square.txt +++ b/src/markup/engine/__tests__/remarkup/link-square.txt @@ -1,8 +1,8 @@ [[http://www.example.com/]] [[http://www.example.com/ | example.com]] ~~~~~~~~~~

http://www.example.com/

-

example.com

\ No newline at end of file +

example.com

diff --git a/src/markup/engine/__tests__/remarkup/link-with-angle-brackets.txt b/src/markup/engine/__tests__/remarkup/link-with-angle-brackets.txt index 212685f..09bc68f 100644 --- a/src/markup/engine/__tests__/remarkup/link-with-angle-brackets.txt +++ b/src/markup/engine/__tests__/remarkup/link-with-angle-brackets.txt @@ -1,3 +1,3 @@ http://.example.com/ ~~~~~~~~~~ -

http://<www>.example.com/

\ No newline at end of file +

http://<www>.example.com/

diff --git a/src/markup/engine/__tests__/remarkup/link-with-punctuation.txt b/src/markup/engine/__tests__/remarkup/link-with-punctuation.txt index 0ec6230..27d1ac6 100644 --- a/src/markup/engine/__tests__/remarkup/link-with-punctuation.txt +++ b/src/markup/engine/__tests__/remarkup/link-with-punctuation.txt @@ -1,7 +1,7 @@ http://www.example.com/, http://www.example.com/.. http://www.example.com/!!! ~~~~~~~~~~

http://www.example.com/, http://www.example.com/.. -http://www.example.com/!!!

\ No newline at end of file +http://www.example.com/!!!

diff --git a/src/markup/engine/__tests__/remarkup/link-with-tilde.txt b/src/markup/engine/__tests__/remarkup/link-with-tilde.txt index c15a9a7..6a40637 100644 --- a/src/markup/engine/__tests__/remarkup/link-with-tilde.txt +++ b/src/markup/engine/__tests__/remarkup/link-with-tilde.txt @@ -1,3 +1,3 @@ http://www.example.com/~ ~~~~~~~~~~ -

http://www.example.com/~

\ No newline at end of file +

http://www.example.com/~

diff --git a/src/markup/engine/__tests__/remarkup/link.txt b/src/markup/engine/__tests__/remarkup/link.txt index c48fba9..7dfeab2 100644 --- a/src/markup/engine/__tests__/remarkup/link.txt +++ b/src/markup/engine/__tests__/remarkup/link.txt @@ -1,3 +1,3 @@ http://www.example.com/ ~~~~~~~~~~ -

http://www.example.com/

\ No newline at end of file +

http://www.example.com/

diff --git a/src/markup/engine/__tests__/remarkup/list-alternate-style.txt b/src/markup/engine/__tests__/remarkup/list-alternate-style.txt index 35d78dc..80671cc 100644 --- a/src/markup/engine/__tests__/remarkup/list-alternate-style.txt +++ b/src/markup/engine/__tests__/remarkup/list-alternate-style.txt @@ -1,11 +1,11 @@ - a -- b --- c ~~~~~~~~~~
  • a
    • b
      • c
  • -
\ No newline at end of file + diff --git a/src/markup/engine/__tests__/remarkup/list-blow-stack.txt b/src/markup/engine/__tests__/remarkup/list-blow-stack.txt index 55e00d5..52bb365 100644 --- a/src/markup/engine/__tests__/remarkup/list-blow-stack.txt +++ b/src/markup/engine/__tests__/remarkup/list-blow-stack.txt @@ -1,97 +1,97 @@ - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a - a derp ~~~~~~~~~~
  • a
    • a
      • a
        • a
          • a
            • a
              • a
                • a
                  • a
                    • a
                      • a
                        • a
                          • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
                            • a
-

derp

\ No newline at end of file +

derp

diff --git a/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt b/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt index 5b28026..18a9f2e 100644 --- a/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt +++ b/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt @@ -1,13 +1,13 @@ # item - item - item derp ~~~~~~~~~~
  1. item
  2. item
  3. item
-

derp

\ No newline at end of file +

derp

diff --git a/src/markup/engine/__tests__/remarkup/list-hash.txt b/src/markup/engine/__tests__/remarkup/list-hash.txt index 05b3a37..ed0577d 100644 --- a/src/markup/engine/__tests__/remarkup/list-hash.txt +++ b/src/markup/engine/__tests__/remarkup/list-hash.txt @@ -1,13 +1,13 @@ # item # item # item derp ~~~~~~~~~~
  1. item
  2. item
  3. item
-

derp

\ No newline at end of file +

derp

diff --git a/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt b/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt index d7a56ae..1e958b9 100644 --- a/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt +++ b/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt @@ -1,11 +1,11 @@ - a -- b --- c ~~~~~~~~~~
  • a
    • b
      • c
  • -
\ No newline at end of file + diff --git a/src/markup/engine/__tests__/remarkup/list-multi.txt b/src/markup/engine/__tests__/remarkup/list-multi.txt index 070732f..9584955 100644 --- a/src/markup/engine/__tests__/remarkup/list-multi.txt +++ b/src/markup/engine/__tests__/remarkup/list-multi.txt @@ -1,10 +1,10 @@ - a -- b -- c ~~~~~~~~~~
  • a
    • b
    • c
  • -
\ No newline at end of file + diff --git a/src/markup/engine/__tests__/remarkup/list-nest.txt b/src/markup/engine/__tests__/remarkup/list-nest.txt index fc071b7..c12a2f1 100644 --- a/src/markup/engine/__tests__/remarkup/list-nest.txt +++ b/src/markup/engine/__tests__/remarkup/list-nest.txt @@ -1,21 +1,21 @@ - item - sub - item # sub # sub - item derp ~~~~~~~~~~
  • item
    • sub
  • item
    1. sub
    2. sub
  • item
-

derp

\ No newline at end of file +

derp

diff --git a/src/markup/engine/__tests__/remarkup/list-staircase.txt b/src/markup/engine/__tests__/remarkup/list-staircase.txt index bd2ffc2..0343af1 100644 --- a/src/markup/engine/__tests__/remarkup/list-staircase.txt +++ b/src/markup/engine/__tests__/remarkup/list-staircase.txt @@ -1,17 +1,17 @@ - top - mid # bot derp ~~~~~~~~~~
      • top
    • mid
  1. bot
-

derp

\ No newline at end of file +

derp

diff --git a/src/markup/engine/__tests__/remarkup/list-star.txt b/src/markup/engine/__tests__/remarkup/list-star.txt index 04ae4fb..63fa0bb 100644 --- a/src/markup/engine/__tests__/remarkup/list-star.txt +++ b/src/markup/engine/__tests__/remarkup/list-star.txt @@ -1,13 +1,13 @@ * item * item * item derp ~~~~~~~~~~
  • item
  • item
  • item
-

derp

\ No newline at end of file +

derp

diff --git a/src/markup/engine/__tests__/remarkup/list.txt b/src/markup/engine/__tests__/remarkup/list.txt index 5df22a3..89d630f 100644 --- a/src/markup/engine/__tests__/remarkup/list.txt +++ b/src/markup/engine/__tests__/remarkup/list.txt @@ -1,9 +1,9 @@ - < > & " text block ~~~~~~~~~~
  • < > & "
-

text block

\ No newline at end of file +

text block

diff --git a/src/markup/engine/__tests__/remarkup/monospaced-in-monospaced.txt b/src/markup/engine/__tests__/remarkup/monospaced-in-monospaced.txt index 66d5858..bc32c31 100644 --- a/src/markup/engine/__tests__/remarkup/monospaced-in-monospaced.txt +++ b/src/markup/engine/__tests__/remarkup/monospaced-in-monospaced.txt @@ -1,12 +1,12 @@ ##SELECT * FROM `table`## `SELECT * FROM ##table##` `**x**` ~~~~~~~~~~

SELECT * FROM `table`

SELECT * FROM ##table##

-

**x**

\ No newline at end of file +

**x**

diff --git a/src/markup/engine/__tests__/remarkup/monospaced.txt b/src/markup/engine/__tests__/remarkup/monospaced.txt index aed134a..b1b6eca 100644 --- a/src/markup/engine/__tests__/remarkup/monospaced.txt +++ b/src/markup/engine/__tests__/remarkup/monospaced.txt @@ -1,3 +1,3 @@ ##ls --color > /dev/null## ~~~~~~~~~~ -

ls --color > /dev/null

\ No newline at end of file +

ls --color > /dev/null

diff --git a/src/markup/engine/__tests__/remarkup/note.txt b/src/markup/engine/__tests__/remarkup/note.txt index 6ff78a0..444b933 100644 --- a/src/markup/engine/__tests__/remarkup/note.txt +++ b/src/markup/engine/__tests__/remarkup/note.txt @@ -1,3 +1,3 @@ NOTE: interesting stuff ~~~~~~~~~~ -
NOTE: interesting stuff
\ No newline at end of file +
NOTE: interesting stuff
diff --git a/src/markup/engine/__tests__/remarkup/raw-escape.txt b/src/markup/engine/__tests__/remarkup/raw-escape.txt index b7dc257..b7c55b9 100644 --- a/src/markup/engine/__tests__/remarkup/raw-escape.txt +++ b/src/markup/engine/__tests__/remarkup/raw-escape.txt @@ -1,11 +1,11 @@ ~1~ ~2Z ~a ~~~~~~~~~~

~1~

~2Z

-

~a

\ No newline at end of file +

~a

diff --git a/src/markup/engine/__tests__/remarkup/simple-table.txt b/src/markup/engine/__tests__/remarkup/simple-table.txt index 2bef633..60803a4 100644 --- a/src/markup/engine/__tests__/remarkup/simple-table.txt +++ b/src/markup/engine/__tests__/remarkup/simple-table.txt @@ -1,15 +1,16 @@ | analyze_resources | original | mobile only | www only | both | | | -------- | ----------- | -------- | ---- | | //real// | 31 s | 24 s | 31 s | 31 s | -------- | //user// | 49 s | 25 s | 31 s | 49 s | -------- | //sys// | 24 s | 12 s | 13 s | 24 s | ------- ~~~~~~~~~~
analyze_resourcesoriginalmobile onlywww onlyboth
real31 s24 s31 s31 s
user49 s25 s31 s49 s
sys24 s12 s13 s24 s
+ diff --git a/src/markup/engine/__tests__/remarkup/simple.txt b/src/markup/engine/__tests__/remarkup/simple.txt index d7ed317..42ef004 100644 --- a/src/markup/engine/__tests__/remarkup/simple.txt +++ b/src/markup/engine/__tests__/remarkup/simple.txt @@ -1,3 +1,3 @@ hello ~~~~~~~~~~ -

hello

\ No newline at end of file +

hello

diff --git a/src/markup/engine/__tests__/remarkup/tick-block-multi.txt b/src/markup/engine/__tests__/remarkup/tick-block-multi.txt index d01ec69..6d3d7f3 100644 --- a/src/markup/engine/__tests__/remarkup/tick-block-multi.txt +++ b/src/markup/engine/__tests__/remarkup/tick-block-multi.txt @@ -1,12 +1,12 @@ ```code more code more code``` ~~~~~~~~~~
code
 
 more code
 
-more code
\ No newline at end of file +more code diff --git a/src/markup/engine/__tests__/remarkup/tick-block.txt b/src/markup/engine/__tests__/remarkup/tick-block.txt index 328087e..35b473c 100644 --- a/src/markup/engine/__tests__/remarkup/tick-block.txt +++ b/src/markup/engine/__tests__/remarkup/tick-block.txt @@ -1,3 +1,3 @@ ```code``` ~~~~~~~~~~ -
code
\ No newline at end of file +
code