API: Changes to MatchConfig

- Avoid recurring default separator regex instatiation
- Change field order

Author: ManuelSchneid3r

include/albert/matchconfig.h

@@ -8,41 +8,45 @@
 namespace albert
 {
 
+// Doxygen does not like raw strings
+// QRegularExpression(R"([\s\\\/\-\[\](){}#!?<>"'=+*.:,;_]+)");
+const QRegularExpression default_separator_regex("([\\s\\\\/\\-\\[\\](){}#!?<>\"'=+*.:,;_]+)");
+
 ///
 /// Configuration for string matching.
 ///
+/// Initialize with designated initializers to avoid hard to find bugs on future changes.
+///
 /// \sa \ref Matcher, \ref IndexQueryHandler
 ///
 class ALBERT_EXPORT MatchConfig
 {
 public:
+
     ///
-    /// The separator regex used to split the compared strings.
+    /// Match strings error tolerant.
     ///
-    QRegularExpression separator_regex =
-        //    QRegularExpression(R"([\s\\\/\-\[\](){}#!?<>"'=+*.:,;_]+)");
-        // make doxygen happy
-        QRegularExpression("([\\s\\\\/\\-\\[\\](){}#!?<>\"'=+*.:,;_]+)");
+    bool fuzzy = false;
 
     ///
     /// Match strings case insensitive.
     ///
     bool ignore_case = true;
 
     ///
-    /// Match strings normalized.
+    /// Match strings independent of their order.
     ///
-    bool ignore_diacritics = true;
+    bool ignore_word_order = true;
 
     ///
-    /// Match strings independent of their order.
+    /// Match strings normalized.
     ///
-    bool ignore_word_order = true;
+    bool ignore_diacritics = true;
 
     ///
-    /// Match strings error tolerant.
+    /// The separator regex used to split the compared strings.
     ///
-    bool fuzzy = false;
+    QRegularExpression separator_regex = default_separator_regex;
 
     ///
     /// The error tolerance.
@@ -52,4 +56,4 @@ class ALBERT_EXPORT MatchConfig
     static const uint error_tolerance_divisor = 4;
 };
 
-}
+} // namespace albert

test/test.cpp

@@ -240,7 +240,10 @@ void AlbertTests::matcher_fuzzy()
 {
     QString abc{"abcdefghijklmnopqrstuvwxyz"};
 
-    MatchConfig c = {.separator_regex = QRegularExpression("[ ]+"), .fuzzy = true};
+    MatchConfig c = {
+        .fuzzy = true,
+        .separator_regex = QRegularExpression("[ ]+")
+    };
 
     QVERIFY(Matcher("abcd", c).match(abc));
     QVERIFY(Matcher("abc_", c).match(abc));
@@ -366,8 +369,8 @@ void AlbertTests::index_fuzzy()
     QStringList abc{"abcdefghijklmnopqrstuvwxyz"};
 
     MatchConfig c = {
-        .separator_regex = QRegularExpression("[ ]+"),
-        .fuzzy = true
+        .fuzzy = true,
+        .separator_regex = QRegularExpression("[ ]+")
     };
 
     QVERIFY(indexMatch(abc, "abcd", c).size() == 1);