Merge branch 'master' into add-scroll-events

3 files changed, 76 insertions, 76 deletions

diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index 5c665920b5..a095f298f2 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -549,14 +549,6 @@ static lua_State *nlua_enter(void)
     // stack: (empty)
     lua_getglobal(lstate, "vim");
     // stack: vim
-    lua_getfield(lstate, -1, "_update_package_paths");
-    // stack: vim, vim._update_package_paths
-    if (lua_pcall(lstate, 0, 0, 0)) {
-      // stack: vim, error
-      nlua_error(lstate, _("E5117: Error while updating package paths: %.*s"));
-      // stack: vim
-    }
-    // stack: vim
     lua_pop(lstate, 1);
     // stack: (empty)
     last_p_rtp = (const void *)p_rtp;
@@ -564,14 +556,6 @@ static lua_State *nlua_enter(void)
   return lstate;
 }
 
-/// Force an update of lua's package paths if runtime path has changed.
-bool nlua_update_package_path(void)
-{
-  lua_State *const lstate = nlua_enter();
-
-  return !!lstate;
-}
-
 static void nlua_print_event(void **argv)
 {
   char *str = argv[0];
@@ -891,6 +875,17 @@ LuaRef nlua_newref(lua_State *lstate, LuaRef original_ref)
   return new_ref;
 }
 
+LuaRef api_new_luaref(LuaRef original_ref)
+{
+  if (original_ref == LUA_NOREF) {
+    return LUA_NOREF;
+  }
+
+  lua_State *const lstate = nlua_enter();
+  return nlua_newref(lstate, original_ref);
+}
+
+
 /// Evaluate lua string
 ///
 /// Used for luaeval().
diff --git a/src/nvim/lua/treesitter.c b/src/nvim/lua/treesitter.c
index 5258352e72..c53e208b00 100644
--- a/src/nvim/lua/treesitter.c
+++ b/src/nvim/lua/treesitter.c
@@ -58,6 +58,7 @@ static struct luaL_Reg node_meta[] = {
   { "__tostring", node_tostring },
   { "__eq", node_eq },
   { "__len", node_child_count },
+  { "id", node_id },
   { "range", node_range },
   { "start", node_start },
   { "end_", node_end },
@@ -176,10 +177,11 @@ int tslua_add_language(lua_State *L)
   }
 
   uint32_t lang_version = ts_language_version(lang);
-  if (lang_version < TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION) {
+  if (lang_version < TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION
+      || lang_version > TREE_SITTER_LANGUAGE_VERSION) {
     return luaL_error(
         L,
-        "ABI version mismatch : expected %" PRIu32 ", found %" PRIu32,
+        "ABI version mismatch : expected %d, found %d",
         TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION, lang_version);
   }
 
@@ -246,7 +248,12 @@ int tslua_push_parser(lua_State *L)
   }
 
   TSParser *parser = ts_parser_new();
-  ts_parser_set_language(parser, lang);
+
+  if (!ts_parser_set_language(parser, lang)) {
+    ts_parser_delete(parser);
+    return luaL_error(L, "Failed to load language : %s", lang_name);
+  }
+
   TSLua_parser *p = lua_newuserdata(L, sizeof(TSLua_parser));  // [udata]
   p->parser = parser;
   p->tree = NULL;
@@ -342,7 +349,7 @@ static int parser_parse(lua_State *L)
     return 0;
   }
 
-  TSTree *new_tree;
+  TSTree *new_tree = NULL;
   size_t len;
   const char *str;
   long bufnr;
@@ -374,6 +381,12 @@ static int parser_parse(lua_State *L)
       return luaL_error(L, "invalid argument to parser:parse()");
   }
 
+  // Sometimes parsing fails (timeout, or wrong parser ABI)
+  // In those case, just return an error.
+  if (!new_tree) {
+    return luaL_error(L, "An error occured when parsing.");
+  }
+
   uint32_t n_ranges = 0;
   TSRange *changed = p->tree ? ts_tree_get_changed_ranges(p->tree, new_tree,
                                                           &n_ranges) : NULL;
@@ -621,6 +634,17 @@ static int node_eq(lua_State *L)
   return 1;
 }
 
+static int node_id(lua_State *L)
+{
+  TSNode node;
+  if (!node_check(L, 1, &node)) {
+    return 0;
+  }
+
+  lua_pushlstring(L, (const char *)&node.id, sizeof node.id);
+  return 1;
+}
+
 static int node_range(lua_State *L)
 {
   TSNode node;
diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua
index bfa8b91208..85d39eaef4 100644
--- a/src/nvim/lua/vim.lua
+++ b/src/nvim/lua/vim.lua
@@ -92,67 +92,48 @@ function vim._os_proc_children(ppid)
   return children
 end
 
--- TODO(ZyX-I): Create compatibility layer.
---{{{1 package.path updater function
--- Last inserted paths. Used to clear out items from package.[c]path when they
--- are no longer in &runtimepath.
-local last_nvim_paths = {}
-function vim._update_package_paths()
-  local cur_nvim_paths = {}
-  local rtps = vim.api.nvim_list_runtime_paths()
-  local sep = package.config:sub(1, 1)
-  for _, key in ipairs({'path', 'cpath'}) do
-    local orig_str = package[key] .. ';'
-    local pathtrails_ordered = {}
-    local orig = {}
-    -- Note: ignores trailing item without trailing `;`. Not using something
-    -- simpler in order to preserve empty items (stand for default path).
-    for s in orig_str:gmatch('[^;]*;') do
-      s = s:sub(1, -2)  -- Strip trailing semicolon
-      orig[#orig + 1] = s
-    end
-    if key == 'path' then
-      -- /?.lua and /?/init.lua
-      pathtrails_ordered = {sep .. '?.lua', sep .. '?' .. sep .. 'init.lua'}
-    else
-      local pathtrails = {}
-      for _, s in ipairs(orig) do
-        -- Find out path patterns. pathtrail should contain something like
-        -- /?.so, \?.dll. This allows not to bother determining what correct
-        -- suffixes are.
-        local pathtrail = s:match('[/\\][^/\\]*%?.*$')
-        if pathtrail and not pathtrails[pathtrail] then
-          pathtrails[pathtrail] = true
-          pathtrails_ordered[#pathtrails_ordered + 1] = pathtrail
-        end
-      end
-    end
-    local new = {}
-    for _, rtp in ipairs(rtps) do
-      if not rtp:match(';') then
-        for _, pathtrail in pairs(pathtrails_ordered) do
-          local new_path = rtp .. sep .. 'lua' .. pathtrail
-          -- Always keep paths from &runtimepath at the start:
-          -- append them here disregarding orig possibly containing one of them.
-          new[#new + 1] = new_path
-          cur_nvim_paths[new_path] = true
-        end
-      end
+local pathtrails = {}
+vim._so_trails = {}
+for s in  (package.cpath..';'):gmatch('[^;]*;') do
+    s = s:sub(1, -2)  -- Strip trailing semicolon
+  -- Find out path patterns. pathtrail should contain something like
+  -- /?.so, \?.dll. This allows not to bother determining what correct
+  -- suffixes are.
+  local pathtrail = s:match('[/\\][^/\\]*%?.*$')
+  if pathtrail and not pathtrails[pathtrail] then
+    pathtrails[pathtrail] = true
+    table.insert(vim._so_trails, pathtrail)
+  end
+end
+
+function vim._load_package(name)
+  -- tricky: when debugging this function we must let vim.inspect
+  -- module to be loaded first:
+  --local inspect = (name == "vim.inspect") and tostring or vim.inspect
+
+  local basename = name:gsub('%.', '/')
+  local paths = {"lua/"..basename..".lua", "lua/"..basename.."/init.lua"}
+  for _,path in ipairs(paths) do
+    local found = vim.api.nvim_get_runtime_file(path, false)
+    if #found > 0 then
+      return loadfile(found[1])
     end
-    for _, orig_path in ipairs(orig) do
-      -- Handle removing obsolete paths originating from &runtimepath: such
-      -- paths either belong to cur_nvim_paths and were already added above or
-      -- to last_nvim_paths and should not be added at all if corresponding
-      -- entry was removed from &runtimepath list.
-      if not (cur_nvim_paths[orig_path] or last_nvim_paths[orig_path]) then
-        new[#new + 1] = orig_path
-      end
+  end
+
+  for _,trail in ipairs(vim._so_trails) do
+    local path = "lua/"..trail:gsub('?',basename)
+    local found = vim.api.nvim_get_runtime_file(path, false)
+    if #found > 0 then
+      return package.loadlib(found[1])
     end
-    package[key] = table.concat(new, ';')
   end
-  last_nvim_paths = cur_nvim_paths
+  return nil
 end
 
+table.insert(package.loaders, 1, vim._load_package)
+
+-- TODO(ZyX-I): Create compatibility layer.
+
 --- Return a human-readable representation of the given object.
 ---
 --@see https://github.com/kikito/inspect.lua