From 84d3bbef23d0de61eb23aec5568bfa136d6bce13 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Thu, 26 Feb 2026 11:44:48 +0100
Subject: [PATCH] fix(map): use names like Map_key_value not Map_keyvalue

This makes little difference in practice except for extremely unlikely
ambiguities. But it looks nicer in compiler errors and stacktraces where
you see the fully expanded names
---
 src/nvim/map_defs.h         | 24 ++++++++++++------------
 src/nvim/map_value_impl.c.h |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/nvim/map_defs.h b/src/nvim/map_defs.h
index 04ecc21090..6ead47f2d3 100644
--- a/src/nvim/map_defs.h
+++ b/src/nvim/map_defs.h
@@ -38,7 +38,7 @@ static inline bool equal_String(String a, String b)
 }
 
 #define Set(type) Set_##type
-#define Map(T, U) Map_##T##U
+#define Map(T, U) Map_##T##_##U
 #define PMap(T) Map(T, ptr_t)
 
 static const int value_init_int = 0;
@@ -123,19 +123,19 @@ void mh_realloc(MapHash *h, uint32_t n_min_buckets);
     Set(T) set; \
     U *values; \
   } Map(T, U); \
-  static inline U map_get_##T##U(Map(T, U) *map, T key) \
+  static inline U map_get_##T##_##U(Map(T, U) *map, T key) \
   { \
     uint32_t k = mh_get_##T(&map->set, key); \
     return k == MH_TOMBSTONE ? value_init_##U : map->values[k]; \
   } \
-  U *map_ref_##T##U(Map(T, U) *map, T key, T **key_alloc); \
-  U *map_put_ref_##T##U(Map(T, U) *map, T key, T **key_alloc, bool *new_item); \
-  static inline void map_put_##T##U(Map(T, U) *map, T key, U value) \
+  U *map_ref_##T##_##U(Map(T, U) *map, T key, T **key_alloc); \
+  U *map_put_ref_##T##_##U(Map(T, U) *map, T key, T **key_alloc, bool *new_item); \
+  static inline void map_put_##T##_##U(Map(T, U) *map, T key, U value) \
   { \
-    U *val = map_put_ref_##T##U(map, key, NULL, NULL); \
+    U *val = map_put_ref_##T##_##U(map, key, NULL, NULL); \
     *val = value; \
   } \
-  U map_del_##T##U(Map(T, U) *map, T key, T *key_alloc); \
+  U map_del_##T##_##U(Map(T, U) *map, T key, T *key_alloc); \
 
 // NOTE: Keys AND values must be allocated! Map and Set does not make a copy.
 
@@ -183,12 +183,12 @@ MAP_DECLS(ColorKey, ColorItem)
     *(set) = (Set(T)) SET_INIT; \
   } while (0)
 
-#define map_get(T, U) map_get_##T##U
+#define map_get(T, U) map_get_##T##_##U
 #define map_has(T, map, key) set_has(T, &(map)->set, key)
-#define map_put(T, U) map_put_##T##U
-#define map_ref(T, U) map_ref_##T##U
-#define map_put_ref(T, U) map_put_ref_##T##U
-#define map_del(T, U) map_del_##T##U
+#define map_put(T, U) map_put_##T##_##U
+#define map_ref(T, U) map_ref_##T##_##U
+#define map_put_ref(T, U) map_put_ref_##T##_##U
+#define map_del(T, U) map_del_##T##_##U
 #define map_size(map) set_size(&(map)->set)
 #define map_clear(T, map) set_clear(T, &(map)->set)
 #define map_destroy(T, map) \
diff --git a/src/nvim/map_value_impl.c.h b/src/nvim/map_value_impl.c.h
index d93856c25d..6673d0e69a 100644
--- a/src/nvim/map_value_impl.c.h
+++ b/src/nvim/map_value_impl.c.h
@@ -7,7 +7,8 @@
 # define VAL_NAME(x) quasiquote(x, ptr_t)
 #endif
 
-#define MAP_NAME(x) VAL_NAME(KEY_NAME(x))
+#define after_underscore(x) quasiquote(x, _)
+#define MAP_NAME(x) VAL_NAME(after_underscore(KEY_NAME(x)))
 #define MAP_TYPE MAP_NAME(Map_)
 #define KEY_TYPE KEY_NAME()
 #define VALUE_TYPE VAL_NAME()