From c6b7d952bdfdbe45933978e1f99afaaecae61770 Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Fri, 16 Nov 2018 23:48:52 +0100 Subject: [PATCH] markdown-conert: fix multiple code blocks --- modules/markdown-converter.pl | 2 +- t/markdown-converter.t | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/markdown-converter.pl b/modules/markdown-converter.pl index 8628c892..b37ea693 100644 --- a/modules/markdown-converter.pl +++ b/modules/markdown-converter.pl @@ -48,7 +48,7 @@ sub MarkdownConvert { print GetHeader('', Ts('Converting %s', $id), ''); $_ = GetPageContent($id); - s/^\{\{\{((?:.*\n)+)\}\}\}$/```$1```/gm; + s/^\{\{\{((?:.*\n)+?)\}\}\}$/```$1```/gm; my $s = MarkdownConvertString('*'); s/\*$s\*/**$1**/g; diff --git a/t/markdown-converter.t b/t/markdown-converter.t index d89c06ff..ce2041e1 100644 --- a/t/markdown-converter.t +++ b/t/markdown-converter.t @@ -17,7 +17,7 @@ require './t/test.pl'; package OddMuse; use utf8; -use Test::More tests => 17; +use Test::More tests => 19; add_module('markdown-converter.pl'); @@ -55,6 +55,16 @@ like $output, qr'```\ncode\n```', 'fenced code'; # Errors found and fixed at a later date $input = qq{ /Toe’s Reach/ + +{{{ +one +}}} + +and + +{{{ +two +}}} }; update_page('test', $input); @@ -62,6 +72,8 @@ update_page('test', $input); my $output = get_page('action=convert id=test'); like $output, qr'\*Toe’s Reach\*', 'Toe’s Reach'; +like $output, qr'^```\none\n```$'m, 'code block one'; +like $output, qr'^```\none\n```$'m, 'code block two'; # check whether the candidates are listed correctly