mask strings before pseudo array conversion

see #118
mmikeww · Dec 21, 2024 · f5d60bf · f5d60bf
1 parent 6415a10
commit f5d60bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ConvertFuncs.ahk b/ConvertFuncs.ahk
@@ -3930,7 +3930,9 @@ ConvertPseudoArray(ScriptStringInput, PseudoArrayName) {
       if (PseudoArrayName.HasOwnProp("regex") && PseudoArrayName.regex)
       {
          ; this is regexmatch array[0] - validate that array has been set -> (m&&m[0])
+         maskStrings(&ScriptStringInput)
          ScriptStringInput := RegExReplace(ScriptStringInput, "is)(?<!\w|&|\.)" ArrayName "(?!&|\w|%|\.|\[|\s*:=)", "(" ArrayName "&&" NewName ")")
+         restoreStrings(&ScriptStringInput)
       }
       else
       {

diff --git a/tests/Test_Folder/Failed conversions/RegExMatch_issue_118-1.ah2 b/tests/Test_Folder/Failed conversions/RegExMatch_issue_118-1.ah2
@@ -2,7 +2,7 @@ if RegExMatch(uri, "^\[url=")
     RegExMatch(uri, "\G[^\]]*", &uri, 6)
 else
 {
-    msgResult := MsgBox("URI appears invalid:`n" (uri && uri[0]), "", 1)
+    msgResult := MsgBox("URI appears invalid:`n" (uri&&uri[0]), "", 1)
     if (msgResult = "Cancel")
         return
 }