Merge pull request #11069 from bfredl/virtualcol

screen: fix vcol counting with virtual text.
neovim · Sep 21, 2019 · d6f658e · d6f658e
2 parents afd576e + 828a6e7
commit d6f658e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
@@ -4007,7 +4007,7 @@ win_line (
             break;
           }
 
-          ++vcol;
+          vcol += cells;
         }
       }
 

diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua
@@ -31,6 +31,9 @@ describe('Buffer highlighting', function()
       [14] = {background = Screen.colors.Gray90},
       [15] = {background = Screen.colors.Gray90, bold = true, foreground = Screen.colors.Brown},
       [16] = {foreground = Screen.colors.Magenta, background = Screen.colors.Gray90},
+      [17] = {foreground = Screen.colors.Magenta, background = Screen.colors.LightRed},
+      [18] = {background = Screen.colors.LightRed},
+      [19] = {foreground = Screen.colors.Blue1, background = Screen.colors.LightRed},
     })
   end)
 
@@ -516,6 +519,32 @@ describe('Buffer highlighting', function()
                                                 |
       ]])
     end)
+
+    it('works with color column', function()
+      eq(-1, set_virtual_text(-1, 3, {{"暗x事", "Comment"}}, {}))
+      screen:expect{grid=[[
+        ^1 + 2 {3:=}{2: 3}                               |
+        3 + {11:ERROR:} invalid syntax               |
+        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5|
+        , 5, 5, 5, 5, 5, 5,  Lorem ipsum dolor s|
+        x = 4 {12:暗x事}                             |
+        {1:~                                       }|
+        {1:~                                       }|
+                                                |
+      ]]}
+
+      command("set colorcolumn=9")
+      screen:expect{grid=[[
+        ^1 + 2 {3:=}{2: }{17:3}                               |
+        3 + {11:ERROR:} invalid syntax               |
+        5, 5, 5,{18: }5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5|
+        , 5, 5, 5, 5, 5, 5,  Lorem ipsum dolor s|
+        x = 4 {12:暗}{19:x}{12:事}                             |
+        {1:~                                       }|
+        {1:~                                       }|
+                                                |
+      ]]}
+    end)
   end)
 
   it('and virtual text use the same namespace counter', function()