mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-03 00:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14145 from teto/remove-tshighlighter

Browse Source 
chore: remove deprecated lua module tshighlighter
This commit is contained in:
Matthieu Coudron
2021-03-16 18:44:41 +01:00
committed by GitHub
parent b0599d2708 2b0c34053d
commit 0ab88c2ea8
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/lua/vim/treesitter.lua
View File

@@ -12,11 +12,7 @@ local M = vim.tbl_extend("error", query, language)
setmetatable(M, { setmetatable(M, {
__index = function (t, k) __index = function (t, k)
if k == "TSHighlighter" then if k == "highlighter" 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
t[k] = require'vim.treesitter.highlighter' t[k] = require'vim.treesitter.highlighter'
return t[k] return t[k]
end end

5
src/nvim/lua/treesitter.c
View File

@@ -171,7 +171,7 @@ int tslua_add_language(lua_State *L)
TSLanguage *lang = lang_parser(); TSLanguage *lang = lang_parser();
if (lang == NULL) { 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); 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) { || lang_version > TREE_SITTER_LANGUAGE_VERSION) {
return luaL_error( return luaL_error(
L, 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_MIN_COMPATIBLE_LANGUAGE_VERSION,
TREE_SITTER_LANGUAGE_VERSION, lang_version); TREE_SITTER_LANGUAGE_VERSION, lang_version);
} }