Merge pull request #9674 from bfredl/bufapi-fix

api/buffer: use aucmd_prepbuf() to manipulate invisible buffer, fix some issues

4 files changed, 24 insertions, 88 deletions

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 9cd178eaeb..3613a8f8bc 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -380,8 +380,6 @@ void nvim_buf_set_lines(uint64_t channel_id,
     }
   }
 
-  win_T *save_curwin = NULL;
-  tabpage_T *save_curtab = NULL;
   size_t new_len = replacement.size;
   size_t old_len = (size_t)(end - start);
   ptrdiff_t extra = 0;  // lines added to text, can be negative
@@ -397,8 +395,8 @@ void nvim_buf_set_lines(uint64_t channel_id,
   }
 
   try_start();
-  bufref_T save_curbuf = { NULL, 0, 0 };
-  switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
+  aco_save_T aco;
+  aucmd_prepbuf(&aco, (buf_T *)buf);
 
   if (u_save((linenr_T)(start - 1), (linenr_T)end) == FAIL) {
     api_set_error(err, kErrorTypeException, "Failed to save undo information");
@@ -465,27 +463,21 @@ void nvim_buf_set_lines(uint64_t channel_id,
   // changed range, and move any in the remainder of the buffer.
   // Only adjust marks if we managed to switch to a window that holds
   // the buffer, otherwise line numbers will be invalid.
-  if (save_curbuf.br_buf == NULL) {
-    mark_adjust((linenr_T)start,
-                (linenr_T)(end - 1),
-                MAXLNUM,
-                (long)extra,
-                false);
-  }
+  mark_adjust((linenr_T)start,
+              (linenr_T)(end - 1),
+              MAXLNUM,
+              (long)extra,
+              false);
 
   changed_lines((linenr_T)start, 0, (linenr_T)end, (long)extra, true);
 
-  if (save_curbuf.br_buf == NULL) {
-    fix_cursor((linenr_T)start, (linenr_T)end, (linenr_T)extra);
-  }
-
 end:
   for (size_t i = 0; i < new_len; i++) {
     xfree(lines[i]);
   }
 
   xfree(lines);
-  restore_win_for_buf(save_curwin, save_curtab, &save_curbuf);
+  aucmd_restbuf(&aco);
   try_end(err);
 }
 
@@ -1109,28 +1101,6 @@ free_exit:
   return 0;
 }
 
-// Check if deleting lines made the cursor position invalid.
-// Changed the lines from "lo" to "hi" and added "extra" lines (negative if
-// deleted).
-static void fix_cursor(linenr_T lo, linenr_T hi, linenr_T extra)
-{
-  if (curwin->w_cursor.lnum >= lo) {
-    // Adjust the cursor position if it's in/after the changed
-    // lines.
-    if (curwin->w_cursor.lnum >= hi) {
-      curwin->w_cursor.lnum += extra;
-      check_cursor_col();
-    } else if (extra < 0) {
-      curwin->w_cursor.lnum = lo;
-      check_cursor();
-    } else {
-      check_cursor_col();
-    }
-    changed_cline_bef_curs();
-  }
-  invalidate_botline();
-}
-
 // Normalizes 0-based indexes to buffer line numbers
 static int64_t normalize_index(buf_T *buf, int64_t index, bool *oob)
 {
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 94d1697083..cb5ed5ecda 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -31,6 +31,7 @@
 #include "nvim/edit.h"
 #include "nvim/eval.h"
 #include "nvim/eval/typval.h"
+#include "nvim/fileio.h"
 #include "nvim/option.h"
 #include "nvim/state.h"
 #include "nvim/syntax.h"
@@ -978,11 +979,12 @@ Buffer nvim_create_buf(Boolean listed, Boolean scratch, Error *err)
     return 0;
   }
   if (scratch) {
-    WITH_BUFFER(buf, {
-      set_option_value("bh", 0L, "hide", OPT_LOCAL);
-      set_option_value("bt", 0L, "nofile", OPT_LOCAL);
-      set_option_value("swf", 0L, NULL, OPT_LOCAL);
-    });
+    aco_save_T aco;
+    aucmd_prepbuf(&aco, buf);
+    set_option_value("bh", 0L, "hide", OPT_LOCAL);
+    set_option_value("bt", 0L, "nofile", OPT_LOCAL);
+    set_option_value("swf", 0L, NULL, OPT_LOCAL);
+    aucmd_restbuf(&aco);
   }
   return buf->b_fnum;
 }
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index 79bed049ea..64c906fc96 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -63,35 +63,6 @@ enum bfa_values {
 # include "buffer.h.generated.h"
 #endif
 
-// Find a window that contains "buf" and switch to it.
-// If there is no such window, use the current window and change "curbuf".
-// Caller must initialize save_curbuf to NULL.
-// restore_win_for_buf() MUST be called later!
-static inline void switch_to_win_for_buf(buf_T *buf,
-                                         win_T **save_curwinp,
-                                         tabpage_T **save_curtabp,
-                                         bufref_T *save_curbuf)
-{
-  win_T *wp;
-  tabpage_T *tp;
-
-  if (!find_win_for_buf(buf, &wp, &tp)
-      || switch_win(save_curwinp, save_curtabp, wp, tp, true) == FAIL) {
-    switch_buffer(save_curbuf, buf);
-  }
-}
-
-static inline void restore_win_for_buf(win_T *save_curwin,
-                                       tabpage_T *save_curtab,
-                                       bufref_T *save_curbuf)
-{
-  if (save_curbuf->br_buf == NULL) {
-    restore_win(save_curwin, save_curtab, true);
-  } else {
-    restore_buffer(save_curbuf);
-  }
-}
-
 static inline void buf_set_changedtick(buf_T *const buf,
                                        const varnumber_T changedtick)
   REAL_FATTR_NONNULL_ALL REAL_FATTR_ALWAYS_INLINE;
@@ -145,15 +116,4 @@ static inline void buf_inc_changedtick(buf_T *const buf)
   buf_set_changedtick(buf, buf_get_changedtick(buf) + 1);
 }
 
-#define WITH_BUFFER(b, code) \
-  do { \
-    win_T *save_curwin = NULL; \
-    tabpage_T *save_curtab = NULL; \
-    bufref_T save_curbuf = { NULL, 0, 0 }; \
-    switch_to_win_for_buf(b, &save_curwin, &save_curtab, &save_curbuf); \
-    code; \
-    restore_win_for_buf(save_curwin, save_curtab, &save_curbuf); \
-  } while (0)
-
-
 #endif  // NVIM_BUFFER_H
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 8b4ad4d3af..ffe650f416 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -1112,11 +1112,15 @@ static void refresh_terminal(Terminal *term)
     return;
   }
   long ml_before = buf->b_ml.ml_line_count;
-  WITH_BUFFER(buf, {
-    refresh_size(term, buf);
-    refresh_scrollback(term, buf);
-    refresh_screen(term, buf);
-  });
+
+  // refresh_ functions assume the terminal buffer is current
+  aco_save_T aco;
+  aucmd_prepbuf(&aco, buf);
+  refresh_size(term, buf);
+  refresh_scrollback(term, buf);
+  refresh_screen(term, buf);
+  aucmd_restbuf(&aco);
+
   long ml_added = buf->b_ml.ml_line_count - ml_before;
   adjust_topline(term, buf, ml_added);
 }