Merge remote-tracking branch 'upstream/master' into userreguserreg

1 files changed, 14 insertions, 11 deletions

diff --git a/src/nvim/plines.h b/src/nvim/plines.h
index 808f6d284e..6aede88c8b 100644
--- a/src/nvim/plines.h
+++ b/src/nvim/plines.h
@@ -1,25 +1,28 @@
-#ifndef NVIM_PLINES_H
-#define NVIM_PLINES_H
+#pragma once
 
 #include <stdbool.h>
+#include <stdint.h>
 
 #include "nvim/buffer_defs.h"
-#include "nvim/vim.h"
+#include "nvim/marktree.h"
+#include "nvim/pos_defs.h"  // IWYU pragma: keep
 
-// Argument for lbr_chartabsize().
+/// Argument for lbr_chartabsize().
 typedef struct {
   win_T *cts_win;
-  char *cts_line;    // start of the line
-  char *cts_ptr;     // current position in line
+  char *cts_line;                ///< start of the line
+  char *cts_ptr;                 ///< current position in line
+  int cts_row;
 
-  bool cts_has_virt_text;  // true if if a property inserts text
-  int cts_cur_text_width;     // width of current inserted text
-  // TODO(bfredl): iterator in to the marktree for scanning virt text
+  bool cts_has_virt_text;        ///< true if if there is inline virtual text
+  int cts_cur_text_width_left;   ///< width of virtual text left of cursor
+  int cts_cur_text_width_right;  ///< width of virtual text right of cursor
+  MarkTreeIter cts_iter[1];
 
-  int cts_vcol;    // virtual column at current position
+  int cts_vcol;                  ///< virtual column at current position
+  int cts_max_head_vcol;         ///< see win_lbr_chartabsize()
 } chartabsize_T;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "plines.h.generated.h"
 #endif
-#endif  // NVIM_PLINES_H