diff options
| author | Matthieu Coudron <teto@users.noreply.github.com> | 2021-03-16 18:44:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 18:44:41 +0100 |
| commit | 0ab88c2ea80caa7cda97b3a8479d0d32e4636ab6 (patch) | |
| tree | e73b25e500be64346f93f8ec9a04f6c9e86ac1f3 | |
| parent | b0599d270841b0fe721b6a1b081763f8cc291a73 (diff) | |
| parent | 2b0c34053da15e40a4bf281d0b45b3b7a55b1a09 (diff) | |
| download | rneovim-0ab88c2ea80caa7cda97b3a8479d0d32e4636ab6.tar.gz rneovim-0ab88c2ea80caa7cda97b3a8479d0d32e4636ab6.tar.bz2 rneovim-0ab88c2ea80caa7cda97b3a8479d0d32e4636ab6.zip | |
Merge pull request #14145 from teto/remove-tshighlighter
chore: remove deprecated lua module tshighlighter
| -rw-r--r-- | runtime/lua/vim/treesitter.lua | 6 | ||||
| -rw-r--r-- | src/nvim/lua/treesitter.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua index 3af66b134c..64a5ba1fd8 100644 --- a/runtime/lua/vim/treesitter.lua +++ b/runtime/lua/vim/treesitter.lua @@ -12,11 +12,7 @@ local M = vim.tbl_extend("error", query, language) setmetatable(M, { __index = function (t, k) - if k == "TSHighlighter" then - a.nvim_err_writeln("vim.TSHighlighter is deprecated, please use vim.treesitter.highlighter") - t[k] = require'vim.treesitter.highlighter' - return t[k] - elseif k == "highlighter" then + if k == "highlighter" then t[k] = require'vim.treesitter.highlighter' return t[k] end diff --git a/src/nvim/lua/treesitter.c b/src/nvim/lua/treesitter.c index a640b97d3b..33974c71cb 100644 --- a/src/nvim/lua/treesitter.c +++ b/src/nvim/lua/treesitter.c @@ -171,7 +171,7 @@ int tslua_add_language(lua_State *L) TSLanguage *lang = lang_parser(); if (lang == NULL) { - return luaL_error(L, "Failed to load parser: internal error"); + return luaL_error(L, "Failed to load parser %s: internal error", path); } uint32_t lang_version = ts_language_version(lang); @@ -179,7 +179,8 @@ int tslua_add_language(lua_State *L) || lang_version > TREE_SITTER_LANGUAGE_VERSION) { return luaL_error( L, - "ABI version mismatch : supported between %d and %d, found %d", + "ABI version mismatch for %s: supported between %d and %d, found %d", + path, TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION, TREE_SITTER_LANGUAGE_VERSION, lang_version); } |