Refactor option_to_string quoting support, introduce Quoting::Raw

1 files changed, 13 insertions, 5 deletions

diff --git a/src/string_utils.hh b/src/string_utils.hh
index 92714a0d..224dffc2 100644
--- a/src/string_utils.hh
+++ b/src/string_utils.hh
@@ -65,10 +65,6 @@ Vector<StringView> wrap_lines(StringView text, ColumnCount max_width);
 int str_to_int(StringView str); // throws on error
 Optional<int> str_to_int_ifp(StringView str);
 
-inline String option_to_string(StringView opt) { return opt.str(); }
-inline String option_from_string(Meta::Type<String>, StringView str) { return str.str(); }
-inline bool option_add(String& opt, StringView val) { opt += val; return not val.empty(); }
-
 template<size_t N>
 struct InplaceString
 {
@@ -142,15 +138,27 @@ inline String shell_quote(StringView s)
 
 enum class Quoting
 {
+    Raw,
     Kakoune,
     Shell
 };
 
 inline auto quoter(Quoting quoting)
 {
-    return quoting == Quoting::Kakoune ? &quote : &shell_quote;
+    switch (quoting)
+    {
+        case Quoting::Kakoune: return &quote;
+        case Quoting::Shell: return &shell_quote;
+        case Quoting::Raw:
+        default:
+            return +[](StringView s) { return s.str(); };
+    }
 }
 
+inline String option_to_string(StringView opt, Quoting quoting) { return quoter(quoting)(opt); }
+inline Vector<String> option_to_strings(StringView opt) { return {opt.str()}; }
+inline String option_from_string(Meta::Type<String>, StringView str) { return str.str(); }
+inline bool option_add(String& opt, StringView val) { opt += val; return not val.empty(); }
 
 }