patch 8.2.3965: Vim9: no easy way to check if Vim9 script is supported
Problem: Vim9: no easy way to check if Vim9 script is supported.
Solution: Add has('vim9script').
diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt
index 1dde731..e79e06e 100644
--- a/runtime/doc/vim9.txt
+++ b/runtime/doc/vim9.txt
@@ -391,8 +391,8 @@
endif
enddef
-If you would do it like this you get an error at compile time that
-"PluginFunc" does not exist, even when "g:loaded_plugin" does not exist: >
+If you do it like this, you get an error at compile time that "PluginFunc"
+does not exist, even when "g:loaded_plugin" does not exist: >
def CallPluginFunc()
if exists('g:loaded_plugin')
PluginFunc() # Error - function not found
@@ -1411,9 +1411,6 @@
2. The "if" statement evaluates to true, the commands up to `endif` are
executed and `finish` bails out before reaching `vim9script`.
-TODO: The "vim9script" feature does not exist yet, it will only be added once
-the Vim9 script syntax has been fully implemented.
-
Export ~
*:export* *:exp*
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 9b49d81..d61797a 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5929,6 +5929,7 @@
0
#endif
},
+ {"vim9script", 1},
{"vimscript-1", 1},
{"vimscript-2", 1},
{"vimscript-3", 1},
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index f79112e..8aea267 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -7,6 +7,23 @@
source shared.vim
source screendump.vim
+def Test_vim9script_feature()
+ # example from the help, here the feature is always present
+ var lines =<< trim END
+ " old style comment
+ if !has('vim9script')
+ " legacy commands would go here
+ finish
+ endif
+ vim9script
+ # Vim9 script commands go here
+ g:didit = true
+ END
+ CheckScriptSuccess(lines)
+ assert_equal(true, g:didit)
+ unlet g:didit
+enddef
+
def Test_range_only()
new
setline(1, ['blah', 'Blah'])
diff --git a/src/version.c b/src/version.c
index db91b29..6499548 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3965,
+/**/
3964,
/**/
3963,