• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisióneb0a1108f885628856811cde35b04466a71a55af (tree)
Tiempo2022-01-17 06:30:03
AutorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

patch 8.2.4117: Vim9: wrong white space error after using imported item

Commit: https://github.com/vim/vim/commit/47036b6bd7e5a0b38f093d9f0630f054b04fa68e
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 16 21:18:53 2022 +0000

patch 8.2.4117: Vim9: wrong white space error after using imported item
Problem: Vim9: wrong white space error after using imported item.
Solution: Don't skip over white space. (closes https://github.com/vim/vim/issues/9544)

Cambiar Resumen

Diferencia incremental

diff -r d58b66b0cb2b -r eb0a1108f885 src/eval.c
--- a/src/eval.c Sun Jan 16 22:00:04 2022 +0100
+++ b/src/eval.c Sun Jan 16 22:30:03 2022 +0100
@@ -6001,7 +6001,6 @@
60016001 idx = find_exported(rettv->vval.v_number, exp_name, &ufunc, &type,
60026002 evalarg->eval_cctx, verbose);
60036003 **arg = cc;
6004- *arg = skipwhite(*arg);
60056004
60066005 if (idx < 0 && ufunc == NULL)
60076006 {
diff -r d58b66b0cb2b -r eb0a1108f885 src/testdir/test_vim9_import.vim
--- a/src/testdir/test_vim9_import.vim Sun Jan 16 22:00:04 2022 +0100
+++ b/src/testdir/test_vim9_import.vim Sun Jan 16 22:30:03 2022 +0100
@@ -69,6 +69,7 @@
6969
7070 g:imported_name = expo.exp_name
7171 expo.exp_name ..= ' Doe'
72+ expo.exp_name = expo.exp_name .. ' Maar'
7273 g:imported_name_appended = expo.exp_name
7374 g:exported_later = expo.exported
7475
@@ -97,7 +98,7 @@
9798 assert_equal('Exported', g:imported_func)
9899 assert_equal('Exported', g:funcref_result)
99100 assert_equal('John', g:imported_name)
100- assert_equal('John Doe', g:imported_name_appended)
101+ assert_equal('John Doe Maar', g:imported_name_appended)
101102 assert_false(exists('g:name'))
102103
103104 Undo_export_script_lines()
diff -r d58b66b0cb2b -r eb0a1108f885 src/version.c
--- a/src/version.c Sun Jan 16 22:00:04 2022 +0100
+++ b/src/version.c Sun Jan 16 22:30:03 2022 +0100
@@ -751,6 +751,8 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 4117,
755+/**/
754756 4116,
755757 /**/
756758 4115,
Show on old repository browser