[meld/meld-3-20] dirdiff: Fix folder comparison ignore blank lines with filters (#314)

[Kai Willadsen <kaiw src gnome org>]

commit c6ac59c47c3a64635d5ec016eb2bcb4681302577
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon May 6 08:49:55 2019 +1000

    dirdiff: Fix folder comparison ignore blank lines with filters (#314)
    
    Because of the order of operations, folder comparisons weren't ignoring
    blank line differences when the blank lines were the result of applying
    text filters.

 meld/dirdiff.py | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index ae33ed23..ad33314d 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -139,6 +139,10 @@ def _normalize(contents, ignore_blank_lines, regexes=()):
 
     if regexes:
         contents = (apply_text_filters(c, regexes) for c in contents)
+        if ignore_blank_lines:
+            # We re-remove blank lines here in case applying text
+            # filters has caused more lines to be blank.
+            contents = (remove_blank_lines(c) for c in contents)
 
     return contents