summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-19 13:57:54 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-19 13:57:54 +0100
commit904edabb64422467bf79f48f3a6305e0eddeea94 (patch)
treea5319f4fb48c7e8d2d4c53a0b0954b2c5db7fc6b
parent1a928c20992279dc05c90d152e3f2fa884cf4bc9 (diff)
patch 8.2.0130: Python3 ranges are not testedv8.2.0130
Problem: Python3 ranges are not tested. Solution: Add test. (Dominique Pelle, closes #5498)
-rw-r--r--src/testdir/test_python3.vim47
-rw-r--r--src/version.c2
2 files changed, 49 insertions, 0 deletions
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index aec7721af3..c39515ab1f 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -187,3 +187,50 @@ func Test_unicode()
set encoding=utf8
endfunc
+
+" Test range objects, see :help python-range
+func Test_range()
+ new
+ py3 b = vim.current.buffer
+
+ call setline(1, range(1, 6))
+ py3 r = b.range(2, 4)
+ call assert_equal(6, py3eval('len(b)'))
+ call assert_equal(3, py3eval('len(r)'))
+ call assert_equal('3', py3eval('b[2]'))
+ call assert_equal('4', py3eval('r[2]'))
+
+ call assert_fails('py3 r[3] = "x"', 'IndexError: line number out of range')
+ call assert_fails('py3 x = r[3]', 'IndexError: line number out of range')
+ call assert_fails('py3 r["a"] = "x"', 'TypeError')
+ call assert_fails('py3 x = r["a"]', 'TypeError')
+
+ py3 del r[:]
+ call assert_equal(['1', '5', '6'], getline(1, '$'))
+
+ %d | call setline(1, range(1, 6))
+ py3 r = b.range(2, 5)
+ py3 del r[2]
+ call assert_equal(['1', '2', '3', '5', '6'], getline(1, '$'))
+
+ %d | call setline(1, range(1, 6))
+ py3 r = b.range(2, 4)
+ py3 vim.command("%d,%dnorm Ax" % (r.start + 1, r.end + 1))
+ call assert_equal(['1', '2x', '3x', '4x', '5', '6'], getline(1, '$'))
+
+ %d | call setline(1, range(1, 4))
+ py3 r = b.range(2, 3)
+ py3 r.append(['a', 'b'])
+ call assert_equal(['1', '2', '3', 'a', 'b', '4'], getline(1, '$'))
+ py3 r.append(['c', 'd'], 0)
+ call assert_equal(['1', 'c', 'd', '2', '3', 'a', 'b', '4'], getline(1, '$'))
+
+ %d | call setline(1, range(1, 5))
+ py3 r = b.range(2, 4)
+ py3 r.append('a')
+ call assert_equal(['1', '2', '3', '4', 'a', '5'], getline(1, '$'))
+ py3 r.append('b', 1)
+ call assert_equal(['1', '2', 'b', '3', '4', 'a', '5'], getline(1, '$'))
+
+ bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
index 4f7b789d98..5723465254 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 130,
+/**/
129,
/**/
128,