1 files changed, 23 insertions, 7 deletions
diff --git a/src/nvim/bufhl_defs.h b/src/nvim/bufhl_defs.h
index e47bb2a238..d0fb40ab88 100644
--- a/src/nvim/bufhl_defs.h
+++ b/src/nvim/bufhl_defs.h
@@ -3,23 +3,39 @@
 
 #include "nvim/pos.h"
 #include "nvim/lib/kvec.h"
+#include "nvim/lib/kbtree.h"
+
 // bufhl: buffer specific highlighting
 
-struct bufhl_hl_item
-{
+typedef struct {
   int src_id;
   int hl_id;  // highlight group
   colnr_T start;  // first column to highlight
   colnr_T stop;  // last column to highlight
-};
-typedef struct bufhl_hl_item bufhl_hl_item_T;
+} BufhlItem;
+
+typedef struct {
+  char *text;
+  int hl_id;
+} VirtTextChunk;
+
+typedef kvec_t(VirtTextChunk) VirtText;
 
-typedef kvec_t(struct bufhl_hl_item) bufhl_vec_T;
+typedef struct {
+  linenr_T line;
+  kvec_t(BufhlItem) items;
+  int virt_text_src;
+  VirtText virt_text;
+} BufhlLine;
+#define BUFHLLINE_INIT(l) { l, KV_INITIAL_VALUE, 0,  KV_INITIAL_VALUE }
 
 typedef struct {
-  bufhl_vec_T entries;
+  BufhlLine *line;
   int current;
   colnr_T valid_to;
-} bufhl_lineinfo_T;
+} BufhlLineInfo;
 
+#define BUFHL_CMP(a, b) ((int)(((a)->line - (b)->line)))
+KBTREE_INIT(bufhl, BufhlLine *, BUFHL_CMP, 10)  // -V512
+typedef kbtree_t(bufhl) BufhlInfo;
 #endif  // NVIM_BUFHL_DEFS_H