aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2018-06-07 04:06:06 -0400
committerJustin M. Keyes <justinkz@gmail.com>2018-06-07 10:06:06 +0200
commit5a82afa17aa7dec33af2f9c67e7786e7b5e9e8bb (patch)
tree2f3e26ba5fbdbc6dd4fcf26f6bff607c8c3a0562
parent7f6c1d256f4c9f78d71b4a605095d3dea0ea7abb (diff)
downloadrneovim-5a82afa17aa7dec33af2f9c67e7786e7b5e9e8bb.tar.gz
rneovim-5a82afa17aa7dec33af2f9c67e7786e7b5e9e8bb.tar.bz2
rneovim-5a82afa17aa7dec33af2f9c67e7786e7b5e9e8bb.zip
vim-patch:8.0.0265: ml_get error when :pydo deletes lines (#8492)
Problem: May get ml_get error when :pydo deletes lines or switches to another buffer. (Nikolai Pavlov, issue vim/vim#1421) Solution: Check the buffer and line every time. https://github.com/vim/vim/commit/a58883b4ea0bbb813fd4dd7eb49dd6f03e3e5387 (We only include the tests, the Vim code changes are N/A for Nvim.)
-rw-r--r--src/nvim/testdir/Makefile2
-rw-r--r--src/nvim/testdir/test_python2.vim24
-rw-r--r--src/nvim/testdir/test_python3.vim24
3 files changed, 50 insertions, 0 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index c1ede08c31..a161f14bc8 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -88,6 +88,8 @@ NEW_TESTS ?= \
test_options.res \
test_profile.res \
test_put.res \
+ test_python2.res \
+ test_python3.res \
test_quickfix.res \
test_quotestar.res \
test_recover.res \
diff --git a/src/nvim/testdir/test_python2.vim b/src/nvim/testdir/test_python2.vim
new file mode 100644
index 0000000000..fb98c1eda7
--- /dev/null
+++ b/src/nvim/testdir/test_python2.vim
@@ -0,0 +1,24 @@
+" Test for python 2 commands.
+" TODO: move tests from test87.in here.
+
+if !has('python')
+ finish
+endif
+
+func Test_pydo()
+ " Check deleting lines does not trigger ml_get error.
+ py import vim
+ new
+ call setline(1, ['one', 'two', 'three'])
+ pydo vim.command("%d_")
+ bwipe!
+
+ " Check switching to another buffer does not trigger ml_get error.
+ new
+ let wincount = winnr('$')
+ call setline(1, ['one', 'two', 'three'])
+ pydo vim.command("new")
+ call assert_equal(wincount + 1, winnr('$'))
+ bwipe!
+ bwipe!
+endfunc
diff --git a/src/nvim/testdir/test_python3.vim b/src/nvim/testdir/test_python3.vim
new file mode 100644
index 0000000000..bb241dacb1
--- /dev/null
+++ b/src/nvim/testdir/test_python3.vim
@@ -0,0 +1,24 @@
+" Test for python 2 commands.
+" TODO: move tests from test88.in here.
+
+if !has('python3')
+ finish
+endif
+
+func Test_py3do()
+ " Check deleting lines does not trigger an ml_get error.
+ py3 import vim
+ new
+ call setline(1, ['one', 'two', 'three'])
+ py3do vim.command("%d_")
+ bwipe!
+
+ " Check switching to another buffer does not trigger an ml_get error.
+ new
+ let wincount = winnr('$')
+ call setline(1, ['one', 'two', 'three'])
+ py3do vim.command("new")
+ call assert_equal(wincount + 1, winnr('$'))
+ bwipe!
+ bwipe!
+endfunc