Fix importing regexes with slashes in scripts

hluk · Aug 23, 2023 · afaf92c · afaf92c
1 parent d92c62c
commit afaf92c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/scriptable/scriptable.cpp b/src/scriptable/scriptable.cpp
@@ -287,10 +287,15 @@ struct ScriptValueFactory<QRegularExpression> {
     static QRegularExpression fromScriptValue(const QJSValue &value, const Scriptable *)
     {
         if (value.isRegExp()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+            const auto variant = value.toVariant();
+            return variant.toRegularExpression();
+#else
             const QString pattern = toString(value.property("source"));
             return pattern == QStringLiteral("(?:)")
                 ? QRegularExpression()
                 : QRegularExpression(pattern);
+#endif
         }
 
         if (value.isVariant()) {

diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
@@ -1711,7 +1711,7 @@ void Tests::commandsAddCommandsRegExp()
 {
     const QString commands =
             "[Command]\n"
-            "Match=x\n";
+            "Match=^(https?|ftps?)://\\\\$\n";
 
     // Ensure there is a basic RegExp support.
     RUN("/test/", "/test/\n");
@@ -1720,15 +1720,15 @@ void Tests::commandsAddCommandsRegExp()
     RUN("eval" << "exportCommands(importCommands(arguments[1]))" << "--" << commands, commands);
     RUN("eval" << "Object.prototype.toString.call(importCommands(arguments[1])[0].re)" << "--" << commands, "[object RegExp]\n");
     RUN("eval" << "Object.prototype.toString.call(importCommands(arguments[1])[0].wndre)" << "--" << commands, "[object RegExp]\n");
-    RUN("eval" << "importCommands(arguments[1])[0].re" << "--" << commands, "/x/\n");
+    RUN("eval" << "importCommands(arguments[1])[0].re" << "--" << commands, "/^(https?|ftps?):\\/\\/\\$/\n");
     RUN("eval" << "importCommands(arguments[1])[0].wndre" << "--" << commands, "/(?:)/\n");
 
     RUN("eval" << "addCommands(importCommands(arguments[1]))" << "--" << commands, "");
     RUN("keys" << commandDialogListId << "Enter" << clipboardBrowserId, "");
 
     RUN("exportCommands(commands())", commands);
     RUN("commands()[0].name", "\n");
-    RUN("commands()[0].re", "/x/\n");
+    RUN("commands()[0].re", "/^(https?|ftps?):\\/\\/\\$/\n");
     RUN("commands()[0].wndre", "/(?:)/\n");
 }