Merge remote-tracking branch 'upstream/master' into usermarksusermarks

1 files changed, 121 insertions, 27 deletions

diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua
index f0ffaf2c48..f9b78f5dcd 100644
--- a/test/functional/legacy/display_spec.lua
+++ b/test/functional/legacy/display_spec.lua
@@ -9,6 +9,7 @@ local command = helpers.command
 describe('display', function()
   before_each(clear)
 
+  -- oldtest: Test_display_scroll_at_topline()
   it('scroll when modified at topline vim-patch:8.2.1488', function()
     local screen = Screen.new(20, 4)
     screen:attach()
@@ -26,6 +27,7 @@ describe('display', function()
     ]])
   end)
 
+  -- oldtest: Test_display_scroll_update_visual()
   it('scrolling when modified at topline in Visual mode vim-patch:8.2.4626', function()
     local screen = Screen.new(60, 8)
     screen:attach()
@@ -56,8 +58,53 @@ describe('display', function()
     ]])
   end)
 
-  it('@@@ in the last line shows correctly in a narrow window vim-patch:8.2.4718', function()
-    local screen = Screen.new(60, 10)
+  -- oldtest: Test_matchparen_clear_highlight()
+  it('matchparen highlight is cleared when switching buffer', function()
+    local screen = Screen.new(20, 5)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},
+      [1] = {background = Screen.colors.Cyan},
+    })
+    screen:attach()
+
+    local screen1 = [[
+      {1:^()}                  |
+      {0:~                   }|
+      {0:~                   }|
+      {0:~                   }|
+                          |
+    ]]
+    local screen2 = [[
+      ^aa                  |
+      {0:~                   }|
+      {0:~                   }|
+      {0:~                   }|
+                          |
+    ]]
+
+    exec([[
+      source $VIMRUNTIME/plugin/matchparen.vim
+      set hidden
+      call setline(1, ['()'])
+      normal 0
+    ]])
+    screen:expect(screen1)
+
+    exec([[
+      enew
+      exe "normal iaa\<Esc>0"
+    ]])
+    screen:expect(screen2)
+
+    feed('<C-^>')
+    screen:expect(screen1)
+
+    feed('<C-^>')
+    screen:expect(screen2)
+  end)
+
+  local function run_test_display_lastline(euro)
+    local screen = Screen.new(75, 10)
     screen:set_default_attr_ids({
       [1] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
       [2] = {bold = true, reverse = true},  -- StatusLine
@@ -65,39 +112,86 @@ describe('display', function()
     })
     screen:attach()
     exec([[
-      call setline(1, ['aaa', 'b'->repeat(100)])
+      call setline(1, ['aaa', 'b'->repeat(200)])
       set display=truncate
+
       vsplit
       100wincmd <
     ]])
-    screen:expect([[
-      ^a│aaa                                                       |
-      a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
-      a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                |
-      b│{1:~                                                         }|
-      b│{1:~                                                         }|
-      b│{1:~                                                         }|
-      b│{1:~                                                         }|
-      {1:@}│{1:~                                                         }|
-      {2:< }{3:[No Name] [+]                                             }|
-                                                                  |
-    ]])
+    local fillchar = '@'
+    if euro then
+      command('set fillchars=lastline:€')
+      fillchar = '€'
+    end
+    screen:expect((([[
+      ^a│aaa                                                                      |
+      a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      b│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                   |
+      b│{1:~                                                                        }|
+      b│{1:~                                                                        }|
+      b│{1:~                                                                        }|
+      {1:@}│{1:~                                                                        }|
+      {2:< }{3:[No Name] [+]                                                            }|
+                                                                                 |
+    ]]):gsub('@', fillchar)))
+
     command('set display=lastline')
     screen:expect_unchanged()
+
     command('100wincmd >')
-    screen:expect([[
-      ^aaa                                                       │a|
-      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
-      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                │a|
-      {1:~                                                         }│b|
-      {1:~                                                         }│b|
-      {1:~                                                         }│b|
-      {1:~                                                         }│b|
-      {1:~                                                         }│{1:@}|
-      {2:[No Name] [+]                                              }{3:<}|
-                                                                  |
-    ]])
+    screen:expect((([[
+      ^aaa                                                                      │a|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                   │b|
+      {1:~                                                                        }│b|
+      {1:~                                                                        }│b|
+      {1:~                                                                        }│b|
+      {1:~                                                                        }│{1:@}|
+      {2:[No Name] [+]                                                             }{3:<}|
+                                                                                 |
+    ]]):gsub('@', fillchar)))
+
     command('set display=truncate')
     screen:expect_unchanged()
+
+    command('close')
+    command('3split')
+    screen:expect((([[
+      ^aaa                                                                        |
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      {1:@@@                                                                        }|
+      {2:[No Name] [+]                                                              }|
+      aaa                                                                        |
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                         |
+      {3:[No Name] [+]                                                              }|
+                                                                                 |
+    ]]):gsub('@', fillchar)))
+
+    command('close')
+    command('2vsplit')
+    screen:expect((([[
+      ^aa│aaa                                                                     |
+      a │bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      bb│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+      bb│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb                |
+      bb│{1:~                                                                       }|
+      bb│{1:~                                                                       }|
+      bb│{1:~                                                                       }|
+      {1:@@}│{1:~                                                                       }|
+      {2:<  }{3:[No Name] [+]                                                           }|
+                                                                                 |
+    ]]):gsub('@', fillchar)))
+  end
+
+  -- oldtest: Test_display_lastline()
+  it('display "lastline" works correctly', function()
+    run_test_display_lastline()
+  end)
+  it('display "lastline" works correctly with multibyte fillchar', function()
+    run_test_display_lastline(true)
   end)
 end)