2 files changed, 37 insertions, 0 deletions
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
  })
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
+