Remove option checkers, handle that through the type system

Use a specific type for InsertCompleterDesc with checks in
the option_{from,to}_string functions

1 files changed, 32 insertions, 0 deletions

diff --git a/src/insert_completer.hh b/src/insert_completer.hh
index dcbf3ba1..88759edf 100644
--- a/src/insert_completer.hh
+++ b/src/insert_completer.hh
@@ -4,9 +4,41 @@
 #include "buffer.hh"
 #include "option_manager.hh"
 
+#include "optional.hh"
+
 namespace Kakoune
 {
 
+struct InsertCompleterDesc
+{
+    enum Mode
+    {
+        Word,
+        Option,
+        Filename
+    };
+
+    InsertCompleterDesc(Mode mode = Filename,
+                        Optional<String> param = Optional<String>{})
+        : mode{mode}, param{std::move(param)}
+    {}
+
+    bool operator==(const InsertCompleterDesc& other) const
+    { return mode == other.mode && param == other.param; }
+
+    bool operator!=(const InsertCompleterDesc& other) const
+    { return !(*this == other); }
+
+    Mode mode;
+    Optional<String> param;
+};
+
+using InsertCompleterDescList = std::vector<InsertCompleterDesc>;
+
+
+String option_to_string(const InsertCompleterDesc& opt);
+void option_from_string(const String& str, InsertCompleterDesc& opt);
+
 struct InsertCompletion
 {
     ByteCoord begin;