Add more comments to regex

24e7c3e3 · Douwe Maan · 2fcb2b33 · 24e7c3e3 · 24e7c3e3 · 24e7c3e3
Commit 24e7c3e3 authored Jul 10, 2016 by Douwe Maan
3 changed files
--- a/lib/banzai/filter/blockquote_fence_filter.rb
+++ b/lib/banzai/filter/blockquote_fence_filter.rb
@@ -5,35 +5,56 @@ module Banzai
          (?<code>
            # Code blocks:
            # ```
-            # Anything, including ignored `>>>` blocks
+            # Anything, including `>>>` blocks which are ignored by this filter
            # ```
-            ^```.+?\n```$
+
+            ^```
+            .+?
+            \n```$
          )
        |
          (?<html>
-            # HTML:
+            # HTML block:
            # <tag>
-            # Anything, including ignored `>>>` blocks
+            # Anything, including `>>>` blocks which are ignored by this filter
            # </tag>
-            ^<[^>]+?>.+?\n<\/[^>]+?>$
+
+            ^<[^>]+?>\n
+            .+?
+            \n<\/[^>]+?>$
          )
        |
-          (
-            ^>>>\n(?<quote>
+          (?:
+            # Blockquote:
+            # >>>
+            # Anything, including code and HTML blocks
+            # >>>
+
+            ^>>>\n
+            (?<quote>
              (?:
-                  (?!^```|^<[^>]+?>).
+                  # Any character that doesn't introduce a code or HTML block
+                  (?!
+                      ^```
+                    |
+                      ^<[^>]+?>\n
+                  )
+                  .
                |
+                  # A code block
                  \g<code>
                |
+                  # An HTML block
                  \g<html>
-              )
-            +?)\n>>>$
+              )+?
+            )
+            \n>>>$
          )
      }mx.freeze

      def initialize(text, context = nil, result = nil)
        super text, context, result
-        @text = @text.delete "\r"
+        @text = @text.delete("\r")
      end

      def call

--- a/spec/fixtures/blockquote_fence_after.md
+++ b/spec/fixtures/blockquote_fence_after.md
@@ -8,7 +8,7 @@ Single `>>>` inside code block:

 Double `>>>` inside code block:

-```
+```txt
 # Code
 >>>
 # Code

--- a/spec/fixtures/blockquote_fence_before.md
+++ b/spec/fixtures/blockquote_fence_before.md
@@ -8,7 +8,7 @@ Single `>>>` inside code block:

 Double `>>>` inside code block:

-```
+```txt
 # Code
 >>>
 # Code