Only attach after parser is installed
This commit is contained in:
parent
2442c57b0b
commit
714d9c1825
28
init.lua
28
init.lua
|
|
@ -947,11 +947,10 @@ require('lazy').setup({
|
||||||
config = function()
|
config = function()
|
||||||
---@param buf integer
|
---@param buf integer
|
||||||
---@param language string
|
---@param language string
|
||||||
---@return boolean
|
local function treesitter_try_attach(buf, language)
|
||||||
local function treesitter_attach(buf, language)
|
-- check if parser exists and load it
|
||||||
-- check if parser exists before starting highlighter
|
|
||||||
if not vim.treesitter.language.add(language) then
|
if not vim.treesitter.language.add(language) then
|
||||||
return false
|
return
|
||||||
end
|
end
|
||||||
-- enables syntax highlighting and other treesitter features
|
-- enables syntax highlighting and other treesitter features
|
||||||
vim.treesitter.start(buf, language)
|
vim.treesitter.start(buf, language)
|
||||||
|
|
@ -962,10 +961,9 @@ require('lazy').setup({
|
||||||
|
|
||||||
-- enables treesitter based indentation
|
-- enables treesitter based indentation
|
||||||
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
|
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
|
||||||
return true
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local available_parsers = require('nvim-treesitter.config').get_available()
|
local available_parsers = require('nvim-treesitter').get_available()
|
||||||
vim.api.nvim_create_autocmd('FileType', {
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
callback = function(args)
|
callback = function(args)
|
||||||
local buf, filetype = args.buf, args.match
|
local buf, filetype = args.buf, args.match
|
||||||
|
|
@ -974,17 +972,19 @@ require('lazy').setup({
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if not (treesitter_attach(buf, language) or vim.tbl_contains(available_parsers, language)) then
|
-- try to enable treesitter features in case the parser exists but is not available from `nvim-treesitter`
|
||||||
|
if not vim.tbl_contains(available_parsers, language) then
|
||||||
|
treesitter_try_attach(buf, language)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- automaically install parser for missing languages
|
-- if a parser is available in `nvim-treesitter` enable it after ensuring it is installed
|
||||||
-- attempt to install even if it is available accoring to `vim.treesitter.langauge.add()`,
|
local installed_parsers = require('nvim-treesitter').get_installed 'parsers'
|
||||||
-- to ensure the latest version is installed using `nvim-treesitter`, instead of the outdated vendored parser
|
if vim.tbl_contains(installed_parsers, language) then
|
||||||
if not vim.tbl_contains(require('nvim-treesitter.config').get_installed 'parsers', language) then
|
treesitter_try_attach(buf, language)
|
||||||
-- attempt to start highlighter after installing missing language
|
else
|
||||||
require('nvim-treesitter.install').install(language):await(function()
|
require('nvim-treesitter').install(language):await(function()
|
||||||
treesitter_attach(buf, language)
|
treesitter_try_attach(buf, language)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue