vim-patch:7.4.587 #2622

Problem:    Conceal does not work properly with 'linebreak'. (cs86661)
Solution:   Save and restore boguscols. (Christian Brabandt)

https://github.com/vim/vim/commit/v7-4-587

src/nvim/screen.c

@@ -2174,6 +2174,7 @@ win_line (
                                            wrapping */
   int vcol_off        = 0;              /* offset for concealed characters */
   int did_wcol        = FALSE;
+  int old_boguscols = 0;
 # define VCOL_HLC (vcol - vcol_off)
 # define FIX_FOR_BOGUSCOLS \
   { \
@@ -2181,6 +2182,7 @@ win_line (
     vcol -= vcol_off; \
     vcol_off = 0; \
     col -= boguscols; \
+    old_boguscols = boguscols; \
     boguscols = 0; \
   }
 
@@ -3369,10 +3371,15 @@ win_line (
             int    i;
             int    saved_nextra = n_extra;
 
-            if (is_concealing && vcol_off > 0) {
+            if ((is_concealing || boguscols > 0) && vcol_off > 0) {
               // there are characters to conceal
               tab_len += vcol_off;
             }
+            // boguscols before FIX_FOR_BOGUSCOLS macro from above.
+            if (wp->w_p_list && lcs_tab1 && old_boguscols > 0
+                && n_extra > tab_len) {
+              tab_len += n_extra - tab_len;
+            }
 
             /* if n_extra > 0, it gives the number of chars to use for
              * a tab, else we need to calculate the width for a tab */
@@ -3394,7 +3401,7 @@ win_line (
 
             // n_extra will be increased by FIX_FOX_BOGUSCOLS
             // macro below, so need to adjust for that here
-            if (is_concealing && vcol_off > 0) {
+            if ((is_concealing || boguscols > 0) && vcol_off > 0) {
               n_extra -= vcol_off;
             }
           }
@@ -3405,6 +3412,13 @@ win_line (
            * the tab can be longer than 'tabstop' when there
            * are concealed characters. */
           FIX_FOR_BOGUSCOLS;
+          // Make sure that the highlighting for the tab char will be correctly
+          // set further below (effectively reverts the FIX_FOR_BOGSUCOLS
+          // macro).
+          if (old_boguscols > 0 && n_extra > tab_len && wp->w_p_list
+              && lcs_tab1) {
+            tab_len += n_extra - tab_len;
+          }
           mb_utf8 = FALSE;              /* don't draw as UTF-8 */
           if (wp->w_p_list) {
             c = lcs_tab1;

src/nvim/version.c

@@ -196,7 +196,7 @@ static int included_patches[] = {
   590,
   //589 NA
   588,
-  //587,
+  587,
   //586 NA
   585,
   //584 NA

test/functional/legacy/listlbr_utf8_spec.lua

@@ -16,9 +16,9 @@ describe('linebreak', function()
       put =\"\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP \"
       norm! zt
       set ts=4 sw=4 sts=4 linebreak sbr=+ wrap
-      fu! ScreenChar(width)
+      fu! ScreenChar(width, lines)
       	let c=''
-      	for j in range(1,4)
+      	for j in range(1,a:lines)
       	    for i in range(1,a:width)
       	    	let c.=nr2char(screenchar(j, i))
       	    endfor
@@ -35,12 +35,12 @@ describe('linebreak', function()
       let g:test ="Test 1: set linebreak + set list + fancy listchars"
       exe "set linebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6"
       redraw!
-      let line=ScreenChar(winwidth(0))
+      let line=ScreenChar(winwidth(0),4)
       call DoRecordScreen()
       let g:test ="Test 2: set nolinebreak list"
       set list nolinebreak
       redraw!
-      let line=ScreenChar(winwidth(0))
+      let line=ScreenChar(winwidth(0),4)
       call DoRecordScreen()
       let g:test ="Test 3: set linebreak nolist"
       $put =\"\t*mask = nil;\"
@@ -48,7 +48,18 @@ describe('linebreak', function()
       norm! zt
       set nolist linebreak
       redraw!
-      let line=ScreenChar(winwidth(0))
+      let line=ScreenChar(winwidth(0),4)
+      call DoRecordScreen()
+      let g:test ="Test 4: set linebreak list listchars and concealing"
+      let c_defines=['#define ABCDE		1','#define ABCDEF		1','#define ABCDEFG		1','#define ABCDEFGH	1', '#define MSG_MODE_FILE			1','#define MSG_MODE_CONSOLE		2','#define MSG_MODE_FILE_AND_CONSOLE	3','#define MSG_MODE_FILE_THEN_CONSOLE	4']
+      call append('$', c_defines)
+      vert resize 40
+      $-7
+      norm! zt
+      set list linebreak listchars=tab:>- cole=1
+      syn match Conceal conceal cchar=>'AB\|MSG_MODE'
+      redraw!
+      let line=ScreenChar(winwidth(0),7)
       call DoRecordScreen()
     ]])
 
@@ -74,6 +85,23 @@ describe('linebreak', function()
           *mask = nil;    
       ~                   
       ~                   
-      ~                   ]])
+      ~                   
+      #define ABCDE		1
+      #define ABCDEF		1
+      #define ABCDEFG		1
+      #define ABCDEFGH	1
+      #define MSG_MODE_FILE			1
+      #define MSG_MODE_CONSOLE		2
+      #define MSG_MODE_FILE_AND_CONSOLE	3
+      #define MSG_MODE_FILE_THEN_CONSOLE	4
+      
+      Test 4: set linebreak list listchars and concealing
+      #define ABCDE>-->---1                   
+      #define >CDEF>-->---1                   
+      #define >CDEFG>->---1                   
+      #define >CDEFGH>----1                   
+      #define >_FILE>--------->--->---1       
+      #define >_CONSOLE>---------->---2       
+      #define >_FILE_AND_CONSOLE>---------3   ]])
   end)
 end)