Fix an issue where $ in regular expressions in Substitution filters w…

…ould not always work correctly if the "Ignore carriage return differences" option was enabled. (refs WinMerge#2640)
pipeline-foundation · Feb 12, 2025 · 7e8c711 · 7e8c711
1 parent a678745
commit 7e8c711
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Externals/poco/Foundation/include/Poco/RegularExpression.h b/Externals/poco/Foundation/include/Poco/RegularExpression.h
@@ -70,6 +70,7 @@ class Foundation_API RegularExpression
 		RE_NEWLINE_CRLF    = 0x00300000, /// assume newline is CRLF ("\r\n") [ctor]
 		RE_NEWLINE_ANY     = 0x00400000, /// assume newline is any valid Unicode newline character [ctor]
 		RE_NEWLINE_ANYCRLF = 0x00500000, /// assume newline is any of CR, LF, CRLF [ctor]
+		RE_NEWLINE_MASK    = 0x00F00000,
 		RE_GLOBAL          = 0x10000000, /// replace all occurences (/g) [subst]
 		RE_NO_VARS         = 0x20000000  /// treat dollar in replacement string as ordinary character [subst]
 	};

diff --git a/Externals/poco/Foundation/src/RegularExpression.cpp b/Externals/poco/Foundation/src/RegularExpression.cpp
@@ -75,13 +75,13 @@ RegularExpression::RegularExpression(const std::string& pattern, int options, bo
 	pcre2_compile_context* context = pcre2_compile_context_create(nullptr);
 	if (!context) throw Poco::RegularExpressionException("cannot create compile context");
 
-	if (options & RE_NEWLINE_LF)
+	if ((options & RE_NEWLINE_MASK) == RE_NEWLINE_LF)
 		pcre2_set_newline(context, PCRE2_NEWLINE_LF);
-	else if (options & RE_NEWLINE_CRLF)
+	else if ((options & RE_NEWLINE_MASK) == RE_NEWLINE_CRLF)
 		pcre2_set_newline(context, PCRE2_NEWLINE_CRLF);
-	else if (options & RE_NEWLINE_ANY)
+	else if ((options & RE_NEWLINE_MASK) == RE_NEWLINE_ANY)
 		pcre2_set_newline(context, PCRE2_NEWLINE_ANY);
-	else if (options & RE_NEWLINE_ANYCRLF)
+	else if ((options & RE_NEWLINE_MASK) == RE_NEWLINE_ANYCRLF)
 		pcre2_set_newline(context, PCRE2_NEWLINE_ANYCRLF);
 	else // default RE_NEWLINE_CR
 		pcre2_set_newline(context, PCRE2_NEWLINE_CR);

diff --git a/Src/SubstitutionFiltersList.cpp b/Src/SubstitutionFiltersList.cpp
@@ -261,7 +261,7 @@ std::shared_ptr<SubstitutionList> SubstitutionFiltersList::MakeSubstitutionList(
 						ucr::toUTF8(item.pattern),
 						ucr::toUTF8(item.replacement),
 						(item.caseSensitive ? 0 : Poco::RegularExpression::RE_CASELESS) |
-						 Poco::RegularExpression::RE_MULTILINE);
+						 Poco::RegularExpression::RE_MULTILINE | Poco::RegularExpression::RE_NEWLINE_ANYCRLF);
 				}
 				else
 				{