vim-patch:8.2.3073: when cursor is move for block append wrong text is inserted

Problem:    When cursor is move for block append wrong text is inserted.
Solution:   Calculate an offset. (Christian Brabandt, closes vim/vim#8433,
            closes vim/vim#8288)
https://github.com/vim/vim/commit/4067bd3604215b48e4b4201e28f9e401b08418e4

1 files changed, 38 insertions, 18 deletions

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index f999b68236..68ce9824c7 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -580,6 +580,9 @@ static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def
       spaces -= off;
       count -= off;
     }
+    if (spaces < 0) {  // can happen when the cursor was moved
+      spaces = 0;
+    }
 
     assert(count >= 0);
     newp = (char_u *)xmalloc(STRLEN(oldp) + s_len + (size_t)count + 1);
@@ -2278,6 +2281,7 @@ void op_insert(oparg_T *oap, long count1)
   }
 
   t1 = oap->start;
+  const pos_T start_insert = curwin->w_cursor;
   (void)edit(NUL, false, (linenr_T)count1);
 
   // When a tab was inserted, and the characters in front of the tab
@@ -2315,26 +2319,30 @@ void op_insert(oparg_T *oap, long count1)
     if (oap->start.lnum == curbuf->b_op_start_orig.lnum
         && !bd.is_MAX
         && !did_indent) {
-      if (oap->op_type == OP_INSERT
-          && oap->start.col + oap->start.coladd
-          != curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
-        int t = getviscol2(curbuf->b_op_start_orig.col,
-                           curbuf->b_op_start_orig.coladd);
-        oap->start.col = curbuf->b_op_start_orig.col;
-        pre_textlen -= t - oap->start_vcol;
-        oap->start_vcol = t;
-      } else if (oap->op_type == OP_APPEND
-                 && oap->end.col + oap->end.coladd
-                 >= curbuf->b_op_start_orig.col
-                 + curbuf->b_op_start_orig.coladd) {
-        int t = getviscol2(curbuf->b_op_start_orig.col,
-                           curbuf->b_op_start_orig.coladd);
-        oap->start.col = curbuf->b_op_start_orig.col;
+      const int t = getviscol2(curbuf->b_op_start_orig.col, curbuf->b_op_start_orig.coladd);
+
+      if (!bd.is_MAX) {
+        if (oap->op_type == OP_INSERT
+            && oap->start.col + oap->start.coladd
+            != curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
+          oap->start.col = curbuf->b_op_start_orig.col;
+          pre_textlen -= t - oap->start_vcol;
+          oap->start_vcol = t;
+        } else if (oap->op_type == OP_APPEND
+                   && oap->end.col + oap->end.coladd
+                   >= curbuf->b_op_start_orig.col
+                   + curbuf->b_op_start_orig.coladd) {
+          oap->start.col = curbuf->b_op_start_orig.col;
+          // reset pre_textlen to the value of OP_INSERT
+          pre_textlen += bd.textlen;
+          pre_textlen -= t - oap->start_vcol;
+          oap->start_vcol = t;
+          oap->op_type = OP_INSERT;
+        }
+      } else if (bd.is_MAX && oap->op_type == OP_APPEND) {
         // reset pre_textlen to the value of OP_INSERT
         pre_textlen += bd.textlen;
         pre_textlen -= t - oap->start_vcol;
-        oap->start_vcol = t;
-        oap->op_type = OP_INSERT;
       }
     }
 
@@ -2376,15 +2384,27 @@ void op_insert(oparg_T *oap, long count1)
     firstline = ml_get(oap->start.lnum);
     const size_t len = STRLEN(firstline);
     colnr_T add = bd.textcol;
+    colnr_T offset = 0;  // offset when cursor was moved in insert mode
     if (oap->op_type == OP_APPEND) {
       add += bd.textlen;
+      // account for pressing cursor in insert mode when '$' was used
+      if (bd.is_MAX && start_insert.lnum == Insstart.lnum && start_insert.col > Insstart.col) {
+        offset = start_insert.col - Insstart.col;
+        add -= offset;
+        if (oap->end_vcol > offset) {
+          oap->end_vcol -= offset + 1;
+        } else {
+          // moved outside of the visual block, what to do?
+          return;
+        }
+      }
     }
     if ((size_t)add > len) {
       firstline += len;  // short line, point to the NUL
     } else {
       firstline += add;
     }
-    ins_len = (long)STRLEN(firstline) - pre_textlen;
+    ins_len = (long)STRLEN(firstline) - pre_textlen - offset;
     if (pre_textlen >= 0 && ins_len > 0) {
       ins_text = vim_strnsave(firstline, (size_t)ins_len);
       // block handled here