2 files changed, 14 insertions, 4 deletions
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index 310b194c8c..03d178467b 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -1272,6 +1272,12 @@ bool nlua_exec_file(const char *path)
   return true;
 }
 
+int tslua_get_language_version(lua_State *L)
+{
+  lua_pushnumber(L, TREE_SITTER_LANGUAGE_VERSION);
+  return 1;
+}
+
 static void nlua_add_treesitter(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
 {
   tslua_init(lstate);
@@ -1288,8 +1294,11 @@ static void nlua_add_treesitter(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
   lua_pushcfunction(lstate, tslua_inspect_lang);
   lua_setfield(lstate, -2, "_ts_inspect_language");
 
-  lua_pushcfunction(lstate, ts_lua_parse_query);
+  lua_pushcfunction(lstate, tslua_parse_query);
   lua_setfield(lstate, -2, "_ts_parse_query");
+
+  lua_pushcfunction(lstate, tslua_get_language_version);
+  lua_setfield(lstate, -2, "_ts_get_language_version");
 }
 
 int nlua_expand_pat(expand_T *xp,
diff --git a/src/nvim/lua/treesitter.c b/src/nvim/lua/treesitter.c
index 33974c71cb..38848b0266 100644
--- a/src/nvim/lua/treesitter.c
+++ b/src/nvim/lua/treesitter.c
@@ -222,8 +222,9 @@ int tslua_inspect_lang(lua_State *L)
   lua_setfield(L, -2, "symbols");  // [retval]
 
   size_t nfields = (size_t)ts_language_field_count(lang);
-  lua_createtable(L, nfields-1, 1);  // [retval, fields]
-  for (size_t i = 0; i < nfields; i++) {
+  lua_createtable(L, nfields, 1);  // [retval, fields]
+  // Field IDs go from 1 to nfields inclusive (extra index 0 maps to NULL)
+  for (size_t i = 1; i <= nfields; i++) {
     lua_pushstring(L, ts_language_field_name_for_id(lang, i));
     lua_rawseti(L, -2, i);  // [retval, fields]
   }
@@ -1109,7 +1110,7 @@ static int querycursor_gc(lua_State *L)
 
 // Query methods
 
-int ts_lua_parse_query(lua_State *L)
+int tslua_parse_query(lua_State *L)
 {
   if (lua_gettop(L) < 2 || !lua_isstring(L, 1) || !lua_isstring(L, 2)) {
     return luaL_error(L, "string expected");