From 11bea67a557397a52f881c935f3c85484bdfe121 Mon Sep 17 00:00:00 2001 From: Thomas Vigouroux Date: Thu, 1 Apr 2021 16:50:31 +0200 Subject: fix: allow accessing vim.treesitter.language without require --- runtime/lua/vim/treesitter.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'runtime/lua') diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua index cac0ab864b..f223c7b8c8 100644 --- a/runtime/lua/vim/treesitter.lua +++ b/runtime/lua/vim/treesitter.lua @@ -17,6 +17,9 @@ setmetatable(M, { if k == "highlighter" then t[k] = require'vim.treesitter.highlighter' return t[k] + elseif k == "language" then + t[k] = require"vim.treesitter.language" + return t[k] end end }) -- cgit From 86ced59a6a5f9da137f75b98b5fc03b777255f52 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 23 Mar 2021 23:32:45 +0100 Subject: feat: treesitter checkhealth --- runtime/lua/nvim/treesitter.lua | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 runtime/lua/nvim/treesitter.lua (limited to 'runtime/lua') diff --git a/runtime/lua/nvim/treesitter.lua b/runtime/lua/nvim/treesitter.lua new file mode 100644 index 0000000000..b3369b2e82 --- /dev/null +++ b/runtime/lua/nvim/treesitter.lua @@ -0,0 +1,32 @@ +local M = {} +local ts = vim.treesitter + +function M.list_parsers() + return vim.api.nvim_get_runtime_file('parser/*', true) +end + +function M.check_health() + local report_info = vim.fn['health#report_info'] + local report_ok = vim.fn['health#report_ok'] + local report_error = vim.fn['health#report_error'] + local parsers = M.list_parsers() + + report_info(string.format("Runtime ABI version : %d", ts.language_version)) + + for _, parser in pairs(parsers) do + local parsername = vim.fn.fnamemodify(parser, ":t:r") + + local is_loadable, ret = pcall(ts.language.require_language, parsername) + + if not is_loadable then + report_error(string.format("Impossible to load parser for %s: %s", parsername, ret)) + elseif ret then + report_ok(string.format("Loaded parser for %s", parsername)) + else + report_error(string.format("Unable to load parser for %s", parsername)) + end + end +end + +return M + -- cgit From e8bc3d717eefedc60e49e5f9c8db42a9a662f68a Mon Sep 17 00:00:00 2001 From: Thomas Vigouroux Date: Thu, 1 Apr 2021 17:07:46 +0200 Subject: feat(ts): include parser ABI version in checkhealth --- runtime/lua/nvim/treesitter.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'runtime/lua') diff --git a/runtime/lua/nvim/treesitter.lua b/runtime/lua/nvim/treesitter.lua index b3369b2e82..dd0b11a6c7 100644 --- a/runtime/lua/nvim/treesitter.lua +++ b/runtime/lua/nvim/treesitter.lua @@ -21,7 +21,9 @@ function M.check_health() if not is_loadable then report_error(string.format("Impossible to load parser for %s: %s", parsername, ret)) elseif ret then - report_ok(string.format("Loaded parser for %s", parsername)) + local lang = ts.language.inspect_language(parsername) + report_ok(string.format("Loaded parser for %s: ABI version %d", + parsername, lang._abi_version)) else report_error(string.format("Unable to load parser for %s", parsername)) end -- cgit From 952508d4056b7869720f4a446f2d49963eaf937d Mon Sep 17 00:00:00 2001 From: Thomas Vigouroux Date: Thu, 1 Apr 2021 17:10:39 +0200 Subject: fix(ts): move checkhealth in runtime/vim --- runtime/lua/nvim/treesitter.lua | 34 ---------------------------------- runtime/lua/vim/treesitter/health.lua | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 runtime/lua/nvim/treesitter.lua create mode 100644 runtime/lua/vim/treesitter/health.lua (limited to 'runtime/lua') diff --git a/runtime/lua/nvim/treesitter.lua b/runtime/lua/nvim/treesitter.lua deleted file mode 100644 index dd0b11a6c7..0000000000 --- a/runtime/lua/nvim/treesitter.lua +++ /dev/null @@ -1,34 +0,0 @@ -local M = {} -local ts = vim.treesitter - -function M.list_parsers() - return vim.api.nvim_get_runtime_file('parser/*', true) -end - -function M.check_health() - local report_info = vim.fn['health#report_info'] - local report_ok = vim.fn['health#report_ok'] - local report_error = vim.fn['health#report_error'] - local parsers = M.list_parsers() - - report_info(string.format("Runtime ABI version : %d", ts.language_version)) - - for _, parser in pairs(parsers) do - local parsername = vim.fn.fnamemodify(parser, ":t:r") - - local is_loadable, ret = pcall(ts.language.require_language, parsername) - - if not is_loadable then - report_error(string.format("Impossible to load parser for %s: %s", parsername, ret)) - elseif ret then - local lang = ts.language.inspect_language(parsername) - report_ok(string.format("Loaded parser for %s: ABI version %d", - parsername, lang._abi_version)) - else - report_error(string.format("Unable to load parser for %s", parsername)) - end - end -end - -return M - diff --git a/runtime/lua/vim/treesitter/health.lua b/runtime/lua/vim/treesitter/health.lua new file mode 100644 index 0000000000..dd0b11a6c7 --- /dev/null +++ b/runtime/lua/vim/treesitter/health.lua @@ -0,0 +1,34 @@ +local M = {} +local ts = vim.treesitter + +function M.list_parsers() + return vim.api.nvim_get_runtime_file('parser/*', true) +end + +function M.check_health() + local report_info = vim.fn['health#report_info'] + local report_ok = vim.fn['health#report_ok'] + local report_error = vim.fn['health#report_error'] + local parsers = M.list_parsers() + + report_info(string.format("Runtime ABI version : %d", ts.language_version)) + + for _, parser in pairs(parsers) do + local parsername = vim.fn.fnamemodify(parser, ":t:r") + + local is_loadable, ret = pcall(ts.language.require_language, parsername) + + if not is_loadable then + report_error(string.format("Impossible to load parser for %s: %s", parsername, ret)) + elseif ret then + local lang = ts.language.inspect_language(parsername) + report_ok(string.format("Loaded parser for %s: ABI version %d", + parsername, lang._abi_version)) + else + report_error(string.format("Unable to load parser for %s", parsername)) + end + end +end + +return M + -- cgit