remove idvaluemap, use unordered_map in place

1 files changed, 30 insertions, 0 deletions

diff --git a/src/completion.hh b/src/completion.hh
index 44726dd3..eb1d4fa6 100644
--- a/src/completion.hh
+++ b/src/completion.hh
@@ -5,6 +5,7 @@
 
 #include <vector>
 #include <functional>
+#include <unordered_map>
 
 namespace Kakoune
 {
@@ -40,5 +41,34 @@ inline Completions complete_nothing(const Context& context, CompletionFlags,
     return Completions(cursor_pos, cursor_pos);
 }
 
+template<typename Condition, typename Value>
+CandidateList complete_key_if(const std::unordered_map<String, Value>& map,
+                              const String& prefix,
+                              ByteCount cursor_pos,
+                              Condition condition)
+{
+    String real_prefix = prefix.substr(0, cursor_pos);
+    CandidateList result;
+    for (auto& value : map)
+    {
+        if (not condition(value))
+            continue;
+
+        if (prefix_match(value.first, real_prefix))
+            result.push_back(value.first);
+    }
+    return result;
+}
+
+template<typename Value>
+CandidateList complete_key(const std::unordered_map<String, Value>& map,
+                           const String& prefix,
+                           ByteCount cursor_pos)
+{
+    return complete_key_if(
+        map, prefix, cursor_pos,
+        [](const std::pair<String, Value>&) { return true; });
+}
+
 }
 #endif // completion_hh_INCLUDED