Mercurial > vim

comparison src/testdir/test_vim9_script.vim @ 21709:16d6b626aa8f v8.2.1404

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1404: Vim9: script test fails in the GUI Commit: https://github.com/vim/vim/commit/b3ca98240761d8f320c5a49e077d1aac6496bb21 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 9 14:43:58 2020 +0200 patch 8.2.1404: Vim9: script test fails in the GUI Problem: Vim9: script test fails in the GUI. Solution: Use another key to map. Improve cleanup.
author Bram Moolenaar <Bram@vim.org>
date Sun, 09 Aug 2020 14:45:04 +0200
parents 8e224527391e
children 6c03897bcd60
comparison
equal deleted inserted replaced
21708:e47326f0192a 21709:16d6b626aa8f
1115 export def Exported(): string 1115 export def Exported(): string
1116 return 'Exported' 1116 return 'Exported'
1117 enddef 1117 enddef
1118 END 1118 END
1119 1119
1120 def Undo_export_script_lines()
1121 unlet g:result
1122 unlet g:localname
1123 enddef
1124
1120 def Test_vim9_import_export() 1125 def Test_vim9_import_export()
1121 let import_script_lines =<< trim END 1126 let import_script_lines =<< trim END
1122 vim9script 1127 vim9script
1123 import {exported, Exported} from './Xexport.vim' 1128 import {exported, Exported} from './Xexport.vim'
1124 g:imported = exported 1129 g:imported = exported
1153 assert_equal('Exported', g:funcref_result) 1158 assert_equal('Exported', g:funcref_result)
1154 assert_equal('John', g:imported_name) 1159 assert_equal('John', g:imported_name)
1155 assert_equal('John Doe', g:imported_name_appended) 1160 assert_equal('John Doe', g:imported_name_appended)
1156 assert_false(exists('g:name')) 1161 assert_false(exists('g:name'))
1157 1162
1158 unlet g:result 1163 Undo_export_script_lines()
1159 unlet g:localname
1160 unlet g:imported 1164 unlet g:imported
1161 unlet g:imported_added 1165 unlet g:imported_added
1162 unlet g:imported_later 1166 unlet g:imported_later
1163 unlet g:imported_func 1167 unlet g:imported_func
1164 unlet g:imported_name g:imported_name_appended 1168 unlet g:imported_name g:imported_name_appended
1439 END 1443 END
1440 writefile(lines, 'XsomeExport.vim') 1444 writefile(lines, 'XsomeExport.vim')
1441 lines =<< trim END 1445 lines =<< trim END
1442 vim9script 1446 vim9script
1443 import Funcx from './XsomeExport.vim' 1447 import Funcx from './XsomeExport.vim'
1444 nnoremap <C-B> :call <sid>Funcx()<cr> 1448 nnoremap <F3> :call <sid>Funcx()<cr>
1445 END 1449 END
1446 writefile(lines, 'Xmapscript.vim') 1450 writefile(lines, 'Xmapscript.vim')
1447 1451
1448 source Xmapscript.vim 1452 source Xmapscript.vim
1449 feedkeys("\<c-b>", "xt") 1453 feedkeys("\<F3>", "xt")
1450 assert_equal(42, g:result) 1454 assert_equal(42, g:result)
1451 1455
1452 unlet g:result 1456 unlet g:result
1453 delete('XsomeExport.vim') 1457 delete('XsomeExport.vim')
1454 delete('Xmapscript.vim') 1458 delete('Xmapscript.vim')
1455 nunmap <C-B> 1459 nunmap <F3>
1456 enddef 1460 enddef
1457 1461
1458 def Test_vim9script_fails() 1462 def Test_vim9script_fails()
1459 CheckScriptFailure(['scriptversion 2', 'vim9script'], 'E1039:') 1463 CheckScriptFailure(['scriptversion 2', 'vim9script'], 'E1039:')
1460 CheckScriptFailure(['vim9script', 'scriptversion 2'], 'E1040:') 1464 CheckScriptFailure(['vim9script', 'scriptversion 2'], 'E1040:')
1695 '3 STORESCRIPT exported in .*Xexport_abs.vim.*' .. 1699 '3 STORESCRIPT exported in .*Xexport_abs.vim.*' ..
1696 'g:imported_after = exported.*' .. 1700 'g:imported_after = exported.*' ..
1697 '4 LOADSCRIPT exported from .*Xexport_abs.vim.*' .. 1701 '4 LOADSCRIPT exported from .*Xexport_abs.vim.*' ..
1698 '5 STOREG g:imported_after.*', 1702 '5 STOREG g:imported_after.*',
1699 g:import_disassembled) 1703 g:import_disassembled)
1704
1705 Undo_export_script_lines()
1700 unlet g:imported_abs 1706 unlet g:imported_abs
1701 unlet g:import_disassembled 1707 unlet g:import_disassembled
1702 1708
1703 delete('Ximport_abs.vim') 1709 delete('Ximport_abs.vim')
1704 delete('Xexport_abs.vim') 1710 delete('Xexport_abs.vim')
1718 &rtp = getcwd() 1724 &rtp = getcwd()
1719 source Ximport_rtp.vim 1725 source Ximport_rtp.vim
1720 &rtp = save_rtp 1726 &rtp = save_rtp
1721 1727
1722 assert_equal(9876, g:imported_rtp) 1728 assert_equal(9876, g:imported_rtp)
1729
1730 Undo_export_script_lines()
1723 unlet g:imported_rtp 1731 unlet g:imported_rtp
1724
1725 delete('Ximport_rtp.vim') 1732 delete('Ximport_rtp.vim')
1726 delete('import', 'rf') 1733 delete('import', 'rf')
1727 enddef 1734 enddef
1728 1735
1729 def Test_import_compile_error() 1736 def Test_import_compile_error()