Merge remote-tracking branch 'origin/master' into lsp-followup

3 files changed, 183 insertions, 19 deletions

diff --git a/test/functional/api/mark_extended_spec.lua b/test/functional/api/mark_extended_spec.lua
index 76db9f9d81..1f6c00b7d2 100644
--- a/test/functional/api/mark_extended_spec.lua
+++ b/test/functional/api/mark_extended_spec.lua
@@ -422,7 +422,7 @@ describe('Extmarks buffer api', function()
     set_extmark(ns, marks[1], 1, 2)
     -- Insert a fullwidth (two col) tilde, NICE
     feed('0i～<esc>')
-    check_undo_redo(ns, marks[1], 1, 2, 1, 3)
+    check_undo_redo(ns, marks[1], 1, 2, 1, 5)
   end)
 
   it('marks move with blockwise inserts #extmarks', function()
@@ -475,6 +475,13 @@ describe('Extmarks buffer api', function()
     check_undo_redo(ns, marks[2], 0, 3, 1, 2)
   end)
 
+  it('deleting right before a mark works #extmarks', function()
+    -- op_delete in ops.c
+    set_extmark(ns, marks[1], 0, 2)
+    feed('0lx')
+    check_undo_redo(ns, marks[1], 0, 2, 0, 1)
+  end)
+
   it('deleting on a mark works #extmarks', function()
     -- op_delete in ops.c
     set_extmark(ns, marks[1], 0, 2)
diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua
index 65c5f67726..f589bb0e83 100644
--- a/test/functional/ui/bufhl_spec.lua
+++ b/test/functional/ui/bufhl_spec.lua
@@ -217,6 +217,161 @@ describe('Buffer highlighting', function()
                                                 |
       ]])
     end)
+
+    it('and adjusting columns', function()
+      -- insert before
+      feed('ggiquite <esc>')
+      screen:expect{grid=[[
+        quite^ a {5:longer} example                  |
+        in {6:order} to {7:de}{5:monstr}{7:ate}                 |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+                                                |
+      ]]}
+
+      feed('u')
+      screen:expect{grid=[[
+        ^a {5:longer} example                        |
+        in {6:order} to {7:de}{5:monstr}{7:ate}                 |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+        1 change; before #2  {MATCH:.*}|
+      ]]}
+
+      -- change/insert in the middle
+      feed('+fesAAAA')
+      screen:expect{grid=[[
+        a {5:longer} example                        |
+        in {6:ordAAAA^r} to {7:de}{5:monstr}{7:ate}              |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+        {7:-- INSERT --}                            |
+      ]]}
+
+      feed('<esc>tdD')
+      screen:expect{grid=[[
+        a {5:longer} example                        |
+        in {6:ordAAAAr} t^o                          |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+                                                |
+      ]]}
+
+      feed('u')
+      screen:expect{grid=[[
+        a {5:longer} example                        |
+        in {6:ordAAAAr} to^ demonstrate              |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+        1 change; before #4  {MATCH:.*}|
+      ]]}
+
+      feed('u')
+      screen:expect{grid=[[
+        a {5:longer} example                        |
+        in {6:ord^er} to demonstrate                 |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+        1 change; before #3  {MATCH:.*}|
+      ]]}
+      end)
+
+    it('and joining lines', function()
+      feed('ggJJJ')
+      screen:expect{grid=[[
+        a {5:longer} example in {6:order} to {7:de}{5:monstr}{7:ate}|
+        {7: combin}{8:ing hi}{7:ghlights^ }{8:from diff}{7:erent sou}|
+        {7:rces}                                    |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+                                                |
+      ]]}
+
+      -- TODO(bfredl): perhaps better undo
+      feed('uuu')
+      screen:expect{grid=[[
+        ^a longer example                        |
+        in order to demonstrate                 |
+        combining highlights                    |
+        from different sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+        1 more line; before #2  {MATCH:.*}|
+      ]]}
+    end)
+
+    it('and splitting lines', function()
+      feed('2Gtti<cr>')
+      screen:expect{grid=[[
+        a {5:longer} example                        |
+        in {6:order}                                |
+        ^ to {7:de}{5:monstr}{7:ate}                         |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {7:-- INSERT --}                            |
+      ]]}
+
+      -- TODO(bfredl): keep both "parts" after split, requires proper extmark ranges
+      feed('<esc>tsi<cr>')
+      screen:expect{grid=[[
+        a {5:longer} example                        |
+        in {6:order}                                |
+         to {7:de}{5:mo}                                |
+        ^nstrate                                 |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {7:-- INSERT --}                            |
+      ]]}
+
+      -- TODO(bfredl): perhaps better undo
+      feed('<esc>u')
+      screen:expect{grid=[[
+        a {5:longer} example                        |
+        in {6:order}                                |
+         to demo{7:^nstrat}{8:e}                         |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        1 line less; before #3  {MATCH:.*}|
+      ]]}
+
+      feed('<esc>u')
+      screen:expect{grid=[[
+        a {5:longer} example                        |
+        in order^ to demonstrate                 |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
+        1 line less; before #2  {MATCH:.*}|
+      ]]}
+    end)
   end)
 
   it('prioritizes latest added highlight', function()
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index dbaf6f802b..8ddb2e90a6 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -39,6 +39,7 @@ describe('floating windows', function()
     [19] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.WebGray},
     [20] = {bold = true, foreground = Screen.colors.Brown},
     [21] = {background = Screen.colors.Gray90},
+    [22] = {background = Screen.colors.LightRed},
   }
 
   it('behavior', function()
@@ -398,6 +399,7 @@ describe('floating windows', function()
     it("can use 'minimal' style", function()
       command('set number')
       command('set signcolumn=yes')
+      command('set colorcolumn=1')
       command('set cursorline')
       command('set foldcolumn=1')
       command('hi NormalFloat guibg=#333333')
@@ -414,9 +416,9 @@ describe('floating windows', function()
           [2:----------------------------------------]|
           [3:----------------------------------------]|
         ## grid 2
-          {19:   }{20:  1 }{21:^x                                }|
-          {19:   }{14:  2 }y                                |
-          {19:   }{14:  3 }                                 |
+          {19:   }{20:  1 }{22:^x}{21:                                }|
+          {19:   }{14:  2 }{22:y}                                |
+          {19:   }{14:  3 }{22: }                                |
           {0:~                                       }|
           {0:~                                       }|
           {0:~                                       }|
@@ -430,9 +432,9 @@ describe('floating windows', function()
         ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}}
       else
         screen:expect{grid=[[
-          {19:   }{20:  1 }{21:^x                                }|
-          {19:   }{14:  2 }y                                |
-          {19:   }{14:  3 }   {15:x                   }          |
+          {19:   }{20:  1 }{22:^x}{21:                                }|
+          {19:   }{14:  2 }{22:y}                                |
+          {19:   }{14:  3 }{22: }  {15:x                   }          |
           {0:~         }{15:y                   }{0:          }|
           {0:~         }{15:                    }{0:          }|
           {0:~         }{15:                    }{0:          }|
@@ -454,9 +456,9 @@ describe('floating windows', function()
           [2:----------------------------------------]|
           [3:----------------------------------------]|
         ## grid 2
-          {19: }{17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20:  1 }{21:^x                                }|
-          {19:   }{14:  2 }y                                |
-          {19:   }{14:  3 }                                 |
+          {19: }{17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20:  1 }{22:^x}{21:                                }|
+          {19:   }{14:  2 }{22:y}                                |
+          {19:   }{14:  3 }{22: }                                |
           {0:~                                       }|
           {0:~                                       }|
           {0:~                                       }|
@@ -471,9 +473,9 @@ describe('floating windows', function()
 
       else
         screen:expect([[
-          {19: }{17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20:  1 }{21:^x                                }|
-          {19:   }{14:  2 }y                                |
-          {19:   }{14:  3 }   {17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{15:x                 }          |
+          {19: }{17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20:  1 }{22:^x}{21:                                }|
+          {19:   }{14:  2 }{22:y}                                |
+          {19:   }{14:  3 }{22: }  {17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{15:x                 }          |
           {0:~         }{19:  }{15:y                 }{0:          }|
           {0:~         }{19:  }{15:                  }{0:          }|
           {0:~         }{15:                    }{0:          }|
@@ -495,9 +497,9 @@ describe('floating windows', function()
           [2:----------------------------------------]|
           [3:----------------------------------------]|
         ## grid 2
-          {19:   }{20:  1 }{21:^x                                }|
-          {19:   }{14:  2 }y                                |
-          {19:   }{14:  3 }                                 |
+          {19:   }{20:  1 }{22:^x}{21:                                }|
+          {19:   }{14:  2 }{22:y}                                |
+          {19:   }{14:  3 }{22: }                                |
           {0:~                                       }|
           {0:~                                       }|
           {0:~                                       }|
@@ -511,9 +513,9 @@ describe('floating windows', function()
         ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}}
       else
         screen:expect([[
-          {19:   }{20:  1 }{21:^x                                }|
-          {19:   }{14:  2 }y                                |
-          {19:   }{14:  3 }   {15:                    }          |
+          {19:   }{20:  1 }{22:^x}{21:                                }|
+          {19:   }{14:  2 }{22:y}                                |
+          {19:   }{14:  3 }{22: }  {15:                    }          |
           {0:~         }{15:                    }{0:          }|
           {0:~         }{15:                    }{0:          }|
           {0:~         }{15:                    }{0:          }|