patch 8.2.2733: detecting Lua version is not reliable

Problem:    Detecting Lua version is not reliable.
Solution:   Add "vim.lua_version". (Ozaki Kiichi, closes #8080)

diff --git a/ci/if_ver-1.vim b/ci/if_ver-1.vim
index d5b2bb68c18a8372106a1127669342ff3e449782..adc40a7cb0b5ec956ab1f761ec81ed3482b42d5b 100644 (file)
--- a/ci/if_ver-1.vim
+++ b/ci/if_ver-1.vim
@@ -6,7 +6,7 @@ if 1
   echo "*** Interface versions ***\n"
 
   echo 'Lua:'
-  PrintVer lua print(_VERSION)
+  PrintVer lua print(vim.lua_version, jit and "(LuaJIT)" or "")
 
   echo 'MzScheme:'
   PrintVer mzscheme (display (version))

diff --git a/runtime/doc/if_lua.txt b/runtime/doc/if_lua.txt
index b5569969859578b0eab021059d258e8679c30b22..b7ccb04c53736ac51133d2ff6f8624a2ebc0601f 100644 (file)
--- a/runtime/doc/if_lua.txt
+++ b/runtime/doc/if_lua.txt
@@ -208,6 +208,8 @@ Vim evaluation and command execution, and others.
                                created on demand.  Example: >
                                        :lua print(vim.fn.has('timers'))
 <
+       vim.lua_version         The Lua version Vim was compiled with, in the
+                               form {major}.{minor}.{patch}, e.g. "5.1.4".
 
 ==============================================================================
 3. List userdata                                       *lua-list*

diff --git a/src/if_lua.c b/src/if_lua.c
index abcd850b3d7d86aceefd4e792a892a6cd3f2fa4a..c19244fae57958b326d5d970e35ab937c13fe49c 100644 (file)
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -24,6 +24,12 @@
 #define LUAVIM_EVALNAME "luaeval"
 #define LUAVIM_EVALHEADER "local _A=select(1,...) return "
 
+#ifdef LUA_RELEASE
+# define LUAVIM_VERSION LUA_RELEASE
+#else
+# define LUAVIM_VERSION LUA_VERSION
+#endif
+
 typedef buf_T *luaV_Buffer;
 typedef win_T *luaV_Window;
 typedef dict_T *luaV_Dict;
@@ -2087,6 +2093,7 @@ static const luaL_Reg luaV_module[] = {
     {"open", luaV_open},
     {"type", luaV_type},
     {"call", luaV_call},
+    {"lua_version", NULL},
     {NULL, NULL}
 };
 
@@ -2168,6 +2175,20 @@ luaV_setref(lua_State *L)
     return 1;
 }
 
+    static int
+luaV_pushversion(lua_State *L)
+{
+    int major = 0;
+    int minor = 0;
+    int patch = 0;
+    char s[16];
+
+    sscanf(LUAVIM_VERSION, "Lua %d.%d.%d", &major, &minor, &patch);
+    vim_snprintf(s, sizeof(s), "%d.%d.%d", major, minor, patch);
+    lua_pushstring(L, s);
+    return 0;
+}
+
 #define LUA_VIM_FN_CODE \
     "vim.fn = setmetatable({}, {\n"\
     "  __index = function (t, key)\n"\
@@ -2298,6 +2319,8 @@ luaopen_vim(lua_State *L)
     lua_newtable(L); // vim table
     lua_pushvalue(L, 1); // cache table
     luaV_openlib(L, luaV_module, 1);
+    luaV_pushversion(L);
+    lua_setfield(L, -2, "lua_version");
     lua_setglobal(L, LUAVIM_NAME);
     // custom code
     (void)luaL_dostring(L, LUA_VIM_FN_CODE);

diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
index b9ef0d2364540ae56857df4ff5a0e03cc73cfd9a..c3305631909ff0c8196c5be8b28270a4fd0c0a29 100644 (file)
--- a/src/testdir/test_lua.vim
+++ b/src/testdir/test_lua.vim
@@ -13,18 +13,7 @@ CheckFeature lua
 CheckFeature float
 
 " Depending on the lua version, the error messages are different.
-let s:luaver = split(split(systemlist('lua -v')[0], ' ')[1], '\.')
-if len(s:luaver) < 3
-  " Didn't get something that looks like a version, use _VERSION.
-  let s:luaver = split(split(luaeval('_VERSION'), ' ')[1], '\.')
-endif
-let s:major = str2nr(s:luaver[0])
-let s:minor = str2nr(s:luaver[1])
-if len(s:luaver) >= 3
-  let s:patch = str2nr(s:luaver[2])
-else
-  let s:patch = 0
-endif
+let [s:major, s:minor, s:patch] = luaeval('vim.lua_version')->split('\.')->map({-> str2nr(v:val)})
 let s:lua_53_or_later = 0
 let s:lua_543_or_later = 0
 if (s:major == 5 && s:minor >= 3) || s:major > 5

diff --git a/src/version.c b/src/version.c
index 0bf907354c38127cc8b7330fe303b3e7cac90120..58d6d9f1723144ec7d397463e16d884545996cc8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2733,
 /**/
     2732,
 /**/