vim-patch:7.4.753

Problem:    Appending in Visual mode with 'linebreak' set does not work
            properly.  Also when 'selection' is "exclusive". (Ingo Karkat)
Solution:   Recalculate virtual columns. (Christian Brabandt)

https://github.com/vim/vim/commit/74db34cc9162445e3d500ab2d61c5c19ce9af0ca

4 files changed, 101 insertions, 54 deletions

diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 2f57d8c610..a116b5a0bd 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -1430,6 +1430,9 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
        || VIsual_active
        ) && oap->op_type != OP_NOP) {
     // Avoid a problem with unwanted linebreaks in block mode
+    if (curwin->w_p_lbr) {
+      curwin->w_valid &= ~VALID_VIRTCOL;
+    }
     curwin->w_p_lbr = false;
     oap->is_VIsual = VIsual_active;
     if (oap->motion_force == 'V')
@@ -1598,55 +1601,7 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
     virtual_op = virtual_active();
 
     if (VIsual_active || redo_VIsual_busy) {
-      if (VIsual_mode == Ctrl_V) {      /* block mode */
-        colnr_T start, end;
-
-        oap->motion_type = MBLOCK;
-
-        getvvcol(curwin, &(oap->start),
-            &oap->start_vcol, NULL, &oap->end_vcol);
-        if (!redo_VIsual_busy) {
-          getvvcol(curwin, &(oap->end), &start, NULL, &end);
-
-          if (start < oap->start_vcol)
-            oap->start_vcol = start;
-          if (end > oap->end_vcol) {
-            if (*p_sel == 'e' && start >= 1
-                && start - 1 >= oap->end_vcol)
-              oap->end_vcol = start - 1;
-            else
-              oap->end_vcol = end;
-          }
-        }
-
-        /* if '$' was used, get oap->end_vcol from longest line */
-        if (curwin->w_curswant == MAXCOL) {
-          curwin->w_cursor.col = MAXCOL;
-          oap->end_vcol = 0;
-          for (curwin->w_cursor.lnum = oap->start.lnum;
-               curwin->w_cursor.lnum <= oap->end.lnum;
-               ++curwin->w_cursor.lnum) {
-            getvvcol(curwin, &curwin->w_cursor, NULL, NULL, &end);
-            if (end > oap->end_vcol)
-              oap->end_vcol = end;
-          }
-        } else if (redo_VIsual_busy)
-          oap->end_vcol = oap->start_vcol + redo_VIsual_vcol - 1;
-        /*
-         * Correct oap->end.col and oap->start.col to be the
-         * upper-left and lower-right corner of the block area.
-         *
-         * (Actually, this does convert column positions into character
-         * positions)
-         */
-        curwin->w_cursor.lnum = oap->end.lnum;
-        coladvance(oap->end_vcol);
-        oap->end = curwin->w_cursor;
-
-        curwin->w_cursor = oap->start;
-        coladvance(oap->start_vcol);
-        oap->start = curwin->w_cursor;
-      }
+      get_op_vcol(oap, redo_VIsual_vcol, true);
 
       if (!redo_VIsual_busy && !gui_yank) {
         /*
@@ -1894,9 +1849,14 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
         else
           restart_edit_save = 0;
         restart_edit = 0;
+
         // Restore linebreak, so that when the user edits it looks as before.
-        curwin->w_p_lbr = lbr_saved;
-        /* Reset finish_op now, don't want it set inside edit(). */
+        if (curwin->w_p_lbr != lbr_saved) {
+          curwin->w_p_lbr = lbr_saved;
+          get_op_vcol(oap, redo_VIsual_mode, false);
+        }
+
+        // Reset finish_op now, don't want it set inside edit().
         finish_op = false;
         if (op_change(oap))             /* will call edit() */
           cap->retval |= CA_COMMAND_BUSY;
@@ -1974,7 +1934,10 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
         restart_edit = 0;
 
         // Restore linebreak, so that when the user edits it looks as before.
-        curwin->w_p_lbr = lbr_saved;
+        if (curwin->w_p_lbr != lbr_saved) {
+          curwin->w_p_lbr = lbr_saved;
+          get_op_vcol(oap, redo_VIsual_mode, false);
+        }
 
         op_insert(oap, cap->count1);
 
@@ -1997,7 +1960,11 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
         CancelRedo();
       } else {
         // Restore linebreak, so that when the user edits it looks as before.
-        curwin->w_p_lbr = lbr_saved;
+        if (curwin->w_p_lbr != lbr_saved) {
+          curwin->w_p_lbr = lbr_saved;
+          get_op_vcol(oap, redo_VIsual_mode, false);
+        }
+
         op_replace(oap, cap->nchar);
       }
       break;
@@ -7698,6 +7665,71 @@ static void nv_open(cmdarg_T *cap)
     n_opencmd(cap);
 }
 
+// calculate start/end virtual columns for operating in block mode
+static void get_op_vcol(
+    oparg_T *oap,
+    colnr_T redo_VIsual_vcol,
+    bool initial  // when true: adjust position for 'selectmode'
+)
+{
+  colnr_T start;
+  colnr_T end;
+
+  if (VIsual_mode != Ctrl_V) {
+    return;
+  }
+
+  oap->motion_type = MBLOCK;
+
+  // prevent from moving onto a trail byte
+  if (has_mbyte) {
+    mb_adjustpos(curwin->w_buffer, &oap->end);
+  }
+
+  getvvcol(curwin, &(oap->start), &oap->start_vcol, NULL, &oap->end_vcol);
+  getvvcol(curwin, &(oap->end), &start, NULL, &end);
+
+  if (start < oap->start_vcol) {
+    oap->start_vcol = start;
+  }
+  if (end > oap->end_vcol) {
+    if (initial && *p_sel == 'e'
+        && start >= 1
+        && start - 1 >= oap->end_vcol) {
+      oap->end_vcol = start - 1;
+    } else {
+      oap->end_vcol = end;
+    }
+  }
+  // if '$' was used, get oap->end_vcol from longest line
+  if (curwin->w_curswant == MAXCOL) {
+    curwin->w_cursor.col = MAXCOL;
+    oap->end_vcol = 0;
+    for (curwin->w_cursor.lnum = oap->start.lnum;
+         curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) {
+      getvvcol(curwin, &curwin->w_cursor, NULL, NULL, &end);
+      if (end > oap->end_vcol) {
+        oap->end_vcol = end;
+      }
+    }
+  } else if (redo_VIsual_busy) {
+    oap->end_vcol = oap->start_vcol + redo_VIsual_vcol - 1;
+  }
+
+  // Correct oap->end.col and oap->start.col to be the
+  // upper-left and lower-right corner of the block area.
+  //
+  // (Actually, this does convert column positions into character
+  // positions)
+  curwin->w_cursor.lnum = oap->end.lnum;
+  coladvance(oap->end_vcol);
+  oap->end = curwin->w_cursor;
+
+  curwin->w_cursor = oap->start;
+  coladvance(oap->start_vcol);
+  oap->start = curwin->w_cursor;
+}
+
 // Handle an arbitrary event in normal mode
 static void nv_event(cmdarg_T *cap)
 {
diff --git a/src/nvim/testdir/test_listlbr.in b/src/nvim/testdir/test_listlbr.in
index 36235ea915..57202b46eb 100644
--- a/src/nvim/testdir/test_listlbr.in
+++ b/src/nvim/testdir/test_listlbr.in
@@ -60,11 +60,21 @@ STARTTEST
 :set cpo&vim linebreak
 :let g:test ="Test 6: set linebreak with visual block mode"
 :let line="REMOVE: this not"
+:$put =g:test
 :$put =line
 :let line="REMOVE: aaaaaaaaaaaaa"
 :$put =line
 :1/^REMOVE:
 0jf x:$put
+:set cpo&vim linebreak
+:let g:test ="Test 7: set linebreak with visual block mode and v_b_A"
+:$put =g:test
+Golong line: 40afoobar aTARGET at end
+:exe "norm! $3B\<C-v>eAx\<Esc>"
+:set cpo&vim linebreak sbr=
+:let g:test ="Test 8: set linebreak with visual char mode and changing block"
+:$put =g:test
+Go1111-1111-1111-11-1111-1111-11110f-lv3lc2222bgj.
 :%w! test.out
 :qa!
 ENDTEST
diff --git a/src/nvim/testdir/test_listlbr.ok b/src/nvim/testdir/test_listlbr.ok
index ee74667661..82881234c4 100644
--- a/src/nvim/testdir/test_listlbr.ok
+++ b/src/nvim/testdir/test_listlbr.ok
@@ -32,7 +32,12 @@ Sabbbbbb bla
 ~                   
 ~                   
 ~                   
+Test 6: set linebreak with visual block mode
 this not
 aaaaaaaaaaaaa
 REMOVE: 
 REMOVE: 
+Test 7: set linebreak with visual block mode and v_b_A
+long line: foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar TARGETx at end
+Test 8: set linebreak with visual char mode and changing block
+1111-2222-1111-11-1111-2222-1111
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 2ffe41d6fd..9e2139c297 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -371,7 +371,7 @@ static int included_patches[] = {
   // 756 NA
   // 755,
   // 754,
-  // 753,
+  753,
   // 752,
   // 751 NA
   // 750 NA