Introduce a "double_up" function for doubling up escaping

2 files changed, 22 insertions, 1 deletions

diff --git a/src/string_utils.cc b/src/string_utils.cc
index 497b53fd..742a3f19 100644
--- a/src/string_utils.cc
+++ b/src/string_utils.cc
@@ -339,6 +339,23 @@ String format(StringView fmt, ArrayView<const StringView> params)
     return res;
 }
 
+String double_up(StringView s, StringView characters)
+{
+    String res;
+    auto pos = s.begin();
+    for (auto it = s.begin(), end = s.end(); it != end; ++it)
+    {
+        if (contains(characters, *it))
+        {
+            res += StringView{pos, it+1};
+            res += *it;
+            pos = it+1;
+        }
+    }
+    res += StringView{pos, s.end()};
+    return res;
+}
+
 UnitTest test_string{[]()
 {
     kak_assert(String("youpi ") + "matin" == "youpi matin");
@@ -382,6 +399,8 @@ UnitTest test_string{[]()
     kak_assert(str_to_int("00") == 0);
     kak_assert(str_to_int("-0") == 0);
 
+    kak_assert(double_up(R"('foo%"bar"')", "'\"%") == R"(''foo%%""bar""'')");
+
     kak_assert(replace("tchou/tcha/tchi", "/", "!!") == "tchou!!tcha!!tchi");
 }};
 
diff --git a/src/string_utils.hh b/src/string_utils.hh
index 61a28cad..558ba62f 100644
--- a/src/string_utils.hh
+++ b/src/string_utils.hh
@@ -128,9 +128,11 @@ StringView format_to(ArrayView<char> buffer, StringView fmt, Types&&... params)
     return format_to(buffer, fmt, ArrayView<const StringView>{detail::format_param(std::forward<Types>(params))...});
 }
 
+String double_up(StringView s, StringView characters);
+
 inline String quote(StringView s)
 {
-    return format("'{}'", replace(s, "'", "''"));
+    return format("'{}'", double_up(s, "'"));
 }
 
 }