WIPscratch/ts-linecol

1 files changed, 19 insertions, 2 deletions

diff --git a/src/buffer.c b/src/buffer.c
index a408b799ff4..e1f138d6f42 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -641,6 +641,13 @@ even if it is dead.  The return value is never nil.  */)
   bset_width_table (b, Qnil);
   b->prevent_redisplay_optimizations_p = 1;
 
+#ifdef HAVE_TREE_SITTER
+  b->ts_linecol_cache.pos = 1;
+  b->ts_linecol_cache.byte_pos = 1;
+  b->ts_linecol_cache.line = 1;
+  b->ts_linecol_cache.col = 0;
+#endif
+
   /* An ordinary buffer normally doesn't need markers
      to handle BEGV and ZV.  */
   bset_pt_marker (b, Qnil);
@@ -867,6 +874,13 @@ Interactively, CLONE and INHIBIT-BUFFER-HOOKS are nil.  */)
   b->bidi_paragraph_cache = 0;
   bset_width_table (b, Qnil);
 
+#ifdef HAVE_TREE_SITTER
+  b->ts_linecol_cache.pos = 1;
+  b->ts_linecol_cache.byte_pos = 1;
+  b->ts_linecol_cache.line = 1;
+  b->ts_linecol_cache.col = 0;
+#endif
+
   name = Fcopy_sequence (name);
   set_string_intervals (name, NULL);
   bset_name (b, name);
@@ -2618,6 +2632,11 @@ results, see Info node `(elisp)Swapping Text'.  */)
   bset_point_before_scroll (current_buffer, Qnil);
   bset_point_before_scroll (other_buffer, Qnil);
 
+#ifdef HAVE_TREE_SITTER
+  swapfield_ (ts_parser_list, Lisp_Object);
+  swapfield (ts_linecol_cache, struct ts_linecol);
+#endif
+
   modiff_incr (&current_buffer->text->modiff, 1);
   modiff_incr (&other_buffer->text->modiff, 1);
   modiff_incr (&current_buffer->text->chars_modiff, 1);
@@ -5019,8 +5038,6 @@ DEFUN ("overlay-tree", Foverlay_tree, Soverlay_tree, 0, 1, 0,
 }
 #endif
 
-
-
 /* Initialize the buffer routines.  */
 void
 syms_of_buffer (void)