To: vim_dev@googlegroups.com Subject: Patch 8.2.4161 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4161 Problem: Vim9: warning for missing white space after imported variable. Solution: Do not skip white space. (closes #9567) Files: src/vim9expr.c, src/testdir/test_vim9_import.vim *** ../vim-8.2.4160/src/vim9expr.c 2022-01-19 17:23:00.880902329 +0000 --- src/vim9expr.c 2022-01-20 17:29:21.996316184 +0000 *************** *** 321,327 **** cctx, TRUE); } *p = cc; - p = skipwhite(p); *end = p; if (done) return res; --- 321,326 ---- *** ../vim-8.2.4160/src/testdir/test_vim9_import.vim 2022-01-19 17:21:24.846755312 +0000 --- src/testdir/test_vim9_import.vim 2022-01-20 17:33:36.771959403 +0000 *************** *** 67,72 **** --- 67,77 ---- enddef g:funcref_result = GetExported() + def GetName(): string + return expo.exp_name .. 'son' + enddef + g:long_name = GetName() + g:imported_name = expo.exp_name expo.exp_name ..= ' Doe' expo.exp_name = expo.exp_name .. ' Maar' *************** *** 98,103 **** --- 103,109 ---- assert_equal('Exported', g:imported_func) assert_equal('Exported', g:funcref_result) assert_equal('John', g:imported_name) + assert_equal('Johnson', g:long_name) assert_equal('John Doe Maar', g:imported_name_appended) assert_false(exists('g:name')) *************** *** 109,115 **** unlet g:exported_i2 unlet g:exported_later unlet g:imported_func ! unlet g:imported_name g:imported_name_appended delete('Ximport.vim') # similar, with line breaks --- 115,121 ---- unlet g:exported_i2 unlet g:exported_later unlet g:imported_func ! unlet g:imported_name g:long_name g:imported_name_appended delete('Ximport.vim') # similar, with line breaks *** ../vim-8.2.4160/src/version.c 2022-01-20 15:25:59.313844609 +0000 --- src/version.c 2022-01-20 17:30:33.755116437 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4161, /**/ -- The war between Emacs and Vi is over. Vi has won with 3 to 1. http://m.linuxjournal.com/files/linuxjournal.com/linuxjournal/articles/030/3044/3044s1.html /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///