From cf6056489135f22dfe00b50b34e41439e2ea72dd Mon Sep 17 00:00:00 2001 From: Stephan Seitz Date: Sun, 25 Dec 2022 22:41:59 +0100 Subject: fix: do `vim.treesitter.start()` on highlight module attach Fixes #4026 --- lua/nvim-treesitter/highlight.lua | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'lua') diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua index 5f7dead61..b97b7a039 100644 --- a/lua/nvim-treesitter/highlight.lua +++ b/lua/nvim-treesitter/highlight.lua @@ -1,7 +1,5 @@ local api = vim.api -local ts = vim.treesitter -local parsers = require "nvim-treesitter.parsers" local configs = require "nvim-treesitter.configs" local M = {} @@ -21,25 +19,11 @@ local function enable_syntax(bufnr) api.nvim_buf_set_option(bufnr, "syntax", "ON") end ----@param bufnr integer -function M.stop(bufnr) - if ts.highlighter.active[bufnr] then - ts.highlighter.active[bufnr]:destroy() - end -end - ----@param bufnr integer ----@param lang string -function M.start(bufnr, lang) - local parser = parsers.get_parser(bufnr, lang) - ts.highlighter.new(parser, {}) -end - ---@param bufnr integer ---@param lang string function M.attach(bufnr, lang) local config = configs.get_module "highlight" - M.start(bufnr, lang) + vim.treesitter.start(bufnr, lang) if config and should_enable_vim_regex(config, lang) then enable_syntax(bufnr) end @@ -47,8 +31,26 @@ end ---@param bufnr integer function M.detach(bufnr) - M.stop(bufnr) + vim.treesitter.stop(bufnr) enable_syntax(bufnr) end +---@deprecated +function M.start(...) + vim.notify( + "`nvim-treesitter.highlight.start` is deprecated: use `nvim-treesitter.highlight.attach` or `vim.treesitter.start`", + vim.log.levels.WARN + ) + M.attach(...) +end + +---@deprecated +function M.stop(...) + vim.notify( + "`nvim-treesitter.highlight.stop` is deprecated: use `nvim-treesitter.highlight.detach` or `vim.treesitter.stop`", + vim.log.levels.WARN + ) + M.detach(...) +end + return M -- cgit v1.2.3-70-g09d2