aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2020-01-01 06:03:48 -0800
committerGitHub <noreply@github.com>2020-01-01 06:03:48 -0800
commit99eca048357b8ec72e84b45d21c2a38e25ed6ec0 (patch)
treeed4365b1ec8ec8abf6e485bf034c7afacd82f601
parentdec165b268803d08425e0f173b2487c76a2c440c (diff)
parent0f47870d1b5e893857df007901f5f062939a9eb7 (diff)
downloadrneovim-99eca048357b8ec72e84b45d21c2a38e25ed6ec0.tar.gz
rneovim-99eca048357b8ec72e84b45d21c2a38e25ed6ec0.tar.bz2
rneovim-99eca048357b8ec72e84b45d21c2a38e25ed6ec0.zip
Merge #11645 from janlazo/vim-8.1.1346
vim-patch:8.1.1346,8.2.0068
-rw-r--r--src/nvim/testdir/test_python2.vim8
-rw-r--r--src/nvim/testdir/test_python3.vim15
-rw-r--r--src/nvim/testdir/test_pyx2.vim8
-rw-r--r--src/nvim/testdir/test_pyx3.vim8
4 files changed, 39 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_python2.vim b/src/nvim/testdir/test_python2.vim
index 8d55b59c31..9628a298b9 100644
--- a/src/nvim/testdir/test_python2.vim
+++ b/src/nvim/testdir/test_python2.vim
@@ -164,3 +164,11 @@ func Test_Write_To_Current_Buffer_Fixes_Cursor_Str()
bwipe!
endfunction
+
+func Test_Catch_Exception_Message()
+ try
+ py raise RuntimeError( 'TEST' )
+ catch /.*/
+ call assert_match('^Vim(.*):.*RuntimeError: TEST$', v:exception )
+ endtry
+endfunc
diff --git a/src/nvim/testdir/test_python3.vim b/src/nvim/testdir/test_python3.vim
index cd07b0883f..5268dc9d1e 100644
--- a/src/nvim/testdir/test_python3.vim
+++ b/src/nvim/testdir/test_python3.vim
@@ -164,3 +164,18 @@ func Test_Write_To_Current_Buffer_Fixes_Cursor_Str()
bwipe!
endfunction
+
+func Test_Catch_Exception_Message()
+ try
+ py3 raise RuntimeError( 'TEST' )
+ catch /.*/
+ call assert_match('^Vim(.*):.*RuntimeError: TEST$', v:exception )
+ endtry
+endfunc
+
+func Test_unicode()
+ " this crashed Vim once
+ " set encoding=utf32
+ py3 print('hello')
+ " set encoding=utf8
+endfunc
diff --git a/src/nvim/testdir/test_pyx2.vim b/src/nvim/testdir/test_pyx2.vim
index 50e57c3bfb..10ff3b6e58 100644
--- a/src/nvim/testdir/test_pyx2.vim
+++ b/src/nvim/testdir/test_pyx2.vim
@@ -72,3 +72,11 @@ func Test_pyxfile()
call assert_match(s:py3pattern, split(var)[0])
endif
endfunc
+
+func Test_Catch_Exception_Message()
+ try
+ pyx raise RuntimeError( 'TEST' )
+ catch /.*/
+ call assert_match('^Vim(.*):.*RuntimeError: TEST$', v:exception )
+ endtry
+endfunc
diff --git a/src/nvim/testdir/test_pyx3.vim b/src/nvim/testdir/test_pyx3.vim
index 64546b4688..2044af3abe 100644
--- a/src/nvim/testdir/test_pyx3.vim
+++ b/src/nvim/testdir/test_pyx3.vim
@@ -72,3 +72,11 @@ func Test_pyxfile()
call assert_match(s:py2pattern, split(var)[0])
endif
endfunc
+
+func Test_Catch_Exception_Message()
+ try
+ pyx raise RuntimeError( 'TEST' )
+ catch /.*/
+ call assert_match('^Vim(.*):.*RuntimeError: TEST$', v:exception )
+ endtry
+endfunc