From eee7a3b3989bc58ee2f32159dd5a23b9df01e380 Mon Sep 17 00:00:00 2001 From: Jens Kraemer Date: Tue, 29 Oct 2019 01:51:26 +0000 Subject: [PATCH] eases the regexp used to determine the start of a code block - code blocks in markdown with one or more spaces before the language tag render perfectly fine and thus should not break the sections parsing. --- lib/redmine/wiki_formatting/markdown/formatter.rb | 2 +- test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/redmine/wiki_formatting/markdown/formatter.rb b/lib/redmine/wiki_formatting/markdown/formatter.rb index 9082c3658..f4dd56452 100644 --- a/lib/redmine/wiki_formatting/markdown/formatter.rb +++ b/lib/redmine/wiki_formatting/markdown/formatter.rb @@ -90,7 +90,7 @@ module Redmine inside_pre = false @text.split(/(^(?:.+\r?\n\r?(?:\=+|\-+)|#+.+|(?:~~~|```).*)\s*$)/).each do |part| level = nil - if part =~ /\A(~{3,}|`{3,})(\S+)?\s*$/ + if part =~ /\A(~{3,}|`{3,})(\s*\S+)?\s*$/ if !inside_pre inside_pre = true elsif !$2 diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb index 23d785901..be667c890 100644 --- a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb @@ -142,6 +142,11 @@ EXPECTED Morbi facilisis accumsan orci non pharetra. + ~~~ ruby + def foo + end + ~~~ + ``` Pre Content: -- 2.11.0