Merge pull request livecode#7254 from runrevmark/bugfix-22536

runrevmark · web-flow · commit 812603008145 · 2020-01-17T10:09:46.000Z
[[ Bug 22536 ]] Don't fail MCStringFindAndReplace if replacement not possible
diff --git a/docs/notes/bugfix-22536.md b/docs/notes/bugfix-22536.md
@@ -0,0 +1,2 @@
+# The replace command will no longer fail incorrectly in some cases where there are no possible replacements to be made
+
diff --git a/libfoundation/src/foundation-string.cpp b/libfoundation/src/foundation-string.cpp
@@ -5792,7 +5792,7 @@ bool MCStringFindAndReplace(MCStringRef self, MCStringRef p_pattern, MCStringRef
                 return MCStringFindAndReplaceNative(self, p_pattern, p_replacement, p_options);
         }
         else if (MCStringCantBeEqualToNative(p_pattern, p_options))
-            return false;
+            return true;
     }
 
 	if (!__MCStringUnnativize(self))
diff --git a/tests/lcs/core/strings/replace.livecodescript b/tests/lcs/core/strings/replace.livecodescript
@@ -42,3 +42,18 @@ on TestReplace
    replace tNeedle with tNewNeedle in tHaystack
    TestAssert "replace decomposed with base in decomposed", tHaystack is "hello"
 end TestReplace
+
+on TestReplace_Bug22536
+   try
+      local tPattern
+      put "и" into tPattern
+      put tPattern after tPattern
+      get the number of chars in tPattern
+      get textDecode("foobardsdadadasdasd", "native")
+      if true then
+         replace tPattern with empty in it
+      end if
+   catch tError
+   end try
+   TestAssert "replace never-native unciode in native string", tError is empty
+end TestReplace_Bug22536

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# The replace command will no longer fail incorrectly in some cases where there are no possible replacements to be made`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -5792,7 +5792,7 @@ bool MCStringFindAndReplace(MCStringRef self, MCStringRef p_pattern, MCStringRef`
`5792`	`5792`	`return MCStringFindAndReplaceNative(self, p_pattern, p_replacement, p_options);`
`5793`	`5793`	`}`
`5794`	`5794`	`else if (MCStringCantBeEqualToNative(p_pattern, p_options))`
`5795`		`- return false;`
	`5795`	`+ return true;`
`5796`	`5796`	`}`
`5797`	`5797`
`5798`	`5798`	`if (!__MCStringUnnativize(self))`