fix quoted object names removing wrong quotes

see #326
mmikeww · Jan 9, 2025 · d3bbc9a · d3bbc9a
1 parent 14e2fdf
commit d3bbc9a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/ConvertFuncs.ahk b/ConvertFuncs.ahk
@@ -838,7 +838,7 @@ _convertLines(ScriptString, finalize:=!gUseMasking)   ; 2024-06-26 RENAMED to ac
          Line := RegExReplace(Line, "im)^(.*\s\?.*\:\s*)(\)|$)", '$1 ""$2')
       }
 
-      ; Fix quote object properties [{"A": "B"}] => [{A: "B"}]
+      ; Fix quoted object properties [{"A": "B"}] => [{A: "B"}]
       if InStr(Line, "{") and InStr(Line, '"') and InStr(Line, ":") {
          maskStrings(&Line)
          if InStr(Line, "{") and !InStr(Line, '"') and InStr(Line, ":") {
@@ -853,7 +853,7 @@ _convertLines(ScriptString, finalize:=!gUseMasking)   ; 2024-06-26 RENAMED to ac
                   codeArray.Push(tempCode)
                   tempCode := ""
                   inObj++
-               } else if (char = ":" and inObj) {
+               } else if (char ~= ":|," and inObj) {
                   codeArray.Push(tempCode)
                   tempCode := ""
                } else if (char = "}") {

diff --git a/.../Test_Folder/String/QuotedObjLiterals.ah1 → ...t_Folder/String/QuotedObjLiterals_ex1.ah1 b/.../Test_Folder/String/QuotedObjLiterals.ah1 → ...t_Folder/String/QuotedObjLiterals_ex1.ah1
diff --git a/.../Test_Folder/String/QuotedObjLiterals.ah2 → ...t_Folder/String/QuotedObjLiterals_ex1.ah2 b/.../Test_Folder/String/QuotedObjLiterals.ah2 → ...t_Folder/String/QuotedObjLiterals_ex1.ah2
diff --git a/tests/Test_Folder/String/QuotedObjLiterals_ex2.ah1 b/tests/Test_Folder/String/QuotedObjLiterals_ex2.ah1
@@ -0,0 +1 @@
+obj := {"A": "A", 1: "1"}
diff --git a/tests/Test_Folder/String/QuotedObjLiterals_ex2.ah2 b/tests/Test_Folder/String/QuotedObjLiterals_ex2.ah2
@@ -0,0 +1 @@
+obj := {A: "A", 1: "1"}