Merge #8753 from janlazo/vim-8.0.0724

2 files changed, 66 insertions, 0 deletions

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index e3b717989e..87d7ff5bad 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -93,6 +93,7 @@ NEW_TESTS ?= \
 	    test_quickfix.res \
 	    test_quotestar.res \
 	    test_recover.res \
+	    test_registers.res \
 	    test_retab.res \
 	    test_scrollbind.res \
 	    test_search.res \
diff --git a/src/nvim/testdir/test_registers.vim b/src/nvim/testdir/test_registers.vim
new file mode 100644
index 0000000000..d7b6de5652
--- /dev/null
+++ b/src/nvim/testdir/test_registers.vim
@@ -0,0 +1,65 @@
+
+func Test_yank_shows_register()
+    enew
+    set report=0
+    call setline(1, ['foo', 'bar'])
+    " Line-wise
+    exe 'norm! yy'
+    call assert_equal('1 line yanked', v:statusmsg)
+    exe 'norm! "zyy'
+    call assert_equal('1 line yanked into "z', v:statusmsg)
+    exe 'norm! yj'
+    call assert_equal('2 lines yanked', v:statusmsg)
+    exe 'norm! "zyj'
+    call assert_equal('2 lines yanked into "z', v:statusmsg)
+
+    " Block-wise
+    exe "norm! \<C-V>y"
+    call assert_equal('block of 1 line yanked', v:statusmsg)
+    exe "norm! \<C-V>\"zy"
+    call assert_equal('block of 1 line yanked into "z', v:statusmsg)
+    exe "norm! \<C-V>jy"
+    call assert_equal('block of 2 lines yanked', v:statusmsg)
+    exe "norm! \<C-V>j\"zy"
+    call assert_equal('block of 2 lines yanked into "z', v:statusmsg)
+
+    bwipe!
+endfunc
+
+func Test_display_registers()
+    e file1
+    e file2
+    call setline(1, ['foo', 'bar'])
+    /bar
+    exe 'norm! y2l"axx'
+    call feedkeys("i\<C-R>=2*4\n\<esc>")
+    call feedkeys(":ls\n", 'xt')
+
+    let a = execute('display')
+    let b = execute('registers')
+
+    call assert_equal(a, b)
+    call assert_match('^\n--- Registers ---\n'
+          \ .         '""   a\n'
+          \ .         '"0   ba\n'
+          \ .         '"1   b\n'
+          \ .         '"a   b\n'
+          \ .         '.*'
+          \ .         '"-   a\n'
+          \ .         '.*'
+          \ .         '":   ls\n'
+          \ .         '"%   file2\n'
+          \ .         '"#   file1\n'
+          \ .         '"/   bar\n'
+          \ .         '"=   2\*4', a)
+
+    let a = execute('registers a')
+    call assert_match('^\n--- Registers ---\n'
+          \ .         '"a   b', a)
+
+    let a = execute('registers :')
+    call assert_match('^\n--- Registers ---\n'
+          \ .         '":   ls', a)
+
+    bwipe!
+endfunc