(broken) switch to URegularExpression

Author: carlos-zamora

Diff for: src/cascadia/TerminalSettingsModel/MatchProfilesEntry.cpp

@@ -53,14 +53,40 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         return !(_invalidName || _invalidCommandline || _invalidSource);
     }
 
+#define DEFINE_VALIDATE_FUNCTION(name)                                              \
+    void MatchProfilesEntry::_validate##name() noexcept                             \
+    {                                                                               \
+        _invalid##name = false;                                                     \
+        if (_##name.empty())                                                        \
+        {                                                                           \
+            /* empty field is valid*/                                               \
+            _invalid##name = true;                                                  \
+            return;                                                                 \
+        }                                                                           \
+        UErrorCode status = U_ZERO_ERROR;                                           \
+        _##name##Regex = ::Microsoft::Console::ICU::CreateRegex(_##name, 0, &status); \
+        if (U_FAILURE(status))                                                      \
+        {                                                                           \
+            _invalid##name = true;                                                  \
+            _##name##Regex.reset();                                                 \
+        }                                                                           \
+    }
+
+    DEFINE_VALIDATE_FUNCTION(Name);
+    DEFINE_VALIDATE_FUNCTION(Commandline);
+    DEFINE_VALIDATE_FUNCTION(Source);
+
     bool MatchProfilesEntry::MatchesProfile(const Model::Profile& profile)
     {
-        auto isMatch = [](const std::wregex& regex, std::wstring_view text) {
+        auto isMatch = [](const ::Microsoft::Console::ICU::unique_uregex& regex, std::wstring_view text) {
             if (text.empty())
             {
                 return false;
             }
-            return std::regex_match(text.cbegin(), text.cend(), regex);
+            UErrorCode status = U_ZERO_ERROR;
+            uregex_setText(regex.get(), reinterpret_cast<const UChar*>(text.data()), static_cast<int32_t>(text.size()), &status);
+            const auto match = uregex_matches(regex.get(), 0, &status);
+            return status == U_ZERO_ERROR && match;
         };
 
         if (!_Name.empty() && isMatch(_NameRegex, profile.Name()))

Diff for: src/cascadia/TerminalSettingsModel/MatchProfilesEntry.h

@@ -17,39 +17,29 @@ Author(s):
 
 #include "ProfileCollectionEntry.h"
 #include "MatchProfilesEntry.g.h"
+#include "..\buffer\out\UTextAdapter.h"
 
 // This macro defines the getter and setter for a regex property.
 // The setter tries to instantiate the regex immediately and caches
 // it if successful. If it fails, it sets a boolean flag to track that
 // it failed.
-#define MATCH_PROFILE_REGEX_PROPERTY(name)                         \
-public:                                                            \
-    hstring name() const noexcept                                  \
-    {                                                              \
-        return _##name;                                            \
-    }                                                              \
-    void name(const hstring& value) noexcept                       \
-    {                                                              \
-        _##name = value;                                           \
-        _validate##name();                                         \
-    }                                                              \
-                                                                   \
-private:                                                           \
-    void _validate##name() noexcept                                \
-    {                                                              \
-        _invalid##name = false;                                    \
-        try                                                        \
-        {                                                          \
-            _##name##Regex = { _##name.cbegin(), _##name.cend() }; \
-        }                                                          \
-        catch (std::regex_error)                                   \
-        {                                                          \
-            _invalid##name = true;                                 \
-        }                                                          \
-    }                                                              \
-                                                                   \
-    hstring _##name;                                               \
-    std::wregex _##name##Regex;                                    \
+#define DEFINE_MATCH_PROFILE_REGEX_PROPERTY(name)            \
+public:                                                      \
+    hstring name() const noexcept                            \
+    {                                                        \
+        return _##name;                                      \
+    }                                                        \
+    void name(const hstring& value) noexcept                 \
+    {                                                        \
+        _##name = value;                                     \
+        _validate##name();                                   \
+    }                                                        \
+                                                             \
+private:                                                     \
+    void _validate##name() noexcept;                         \
+                                                             \
+    hstring _##name;                                         \
+    ::Microsoft::Console::ICU::unique_uregex _##name##Regex; \
     bool _invalid##name{ false };
 
 namespace winrt::Microsoft::Terminal::Settings::Model::implementation
@@ -67,9 +57,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         bool ValidateRegexes() const;
         bool MatchesProfile(const Model::Profile& profile);
 
-        MATCH_PROFILE_REGEX_PROPERTY(Name);
-        MATCH_PROFILE_REGEX_PROPERTY(Commandline);
-        MATCH_PROFILE_REGEX_PROPERTY(Source);
+        DEFINE_MATCH_PROFILE_REGEX_PROPERTY(Name)
+        DEFINE_MATCH_PROFILE_REGEX_PROPERTY(Commandline)
+        DEFINE_MATCH_PROFILE_REGEX_PROPERTY(Source)
     };
 }