mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ts): check buffer is loaded when restoring options (#21419)

Browse Source 
fix(treesitter): check buffer is loaded when restoring options

Also restore spelloptions

Fixes #21416
This commit is contained in:
Lewis Russell
2022-12-14 22:54:58 +00:00
committed by GitHub
parent 4a78ed60a3
commit 0887ad1cbb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/lua/vim/treesitter/highlighter.lua
View File

@@ -89,6 +89,8 @@ function TSHighlighter.new(tree, opts)
end end
self.orig_syntax = vim.bo[self.bufnr].syntax self.orig_syntax = vim.bo[self.bufnr].syntax
self.orig_spelloptions = vim.bo[self.bufnr].spelloptions
vim.bo[self.bufnr].syntax = '' vim.bo[self.bufnr].syntax = ''
vim.b[self.bufnr].ts_highlight = true vim.b[self.bufnr].ts_highlight = true
@@ -117,7 +119,10 @@ function TSHighlighter:destroy()
TSHighlighter.active[self.bufnr] = nil TSHighlighter.active[self.bufnr] = nil
end end
vim.bo[self.bufnr].syntax = self.orig_syntax if vim.api.nvim_buf_is_loaded(self.bufnr) then
vim.bo[self.bufnr].syntax = self.orig_syntax
vim.bo[self.bufnr].spelloptions = self.orig_spelloptions
end
end end
---@private ---@private