Skip to content

Commit 3174e05

Browse files
committed
Merge upstream: Merge pull request nvim-lua#1988 from sebastianstudniczek/fix/treesitter-indent-fallback
2 parents f0b4c3d + c0cc054 commit 3174e05

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

lua/kickstart/plugins/treesitter.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ return {
2525
-- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
2626
-- vim.wo.foldmethod = 'expr'
2727

28+
-- check if treesitter indentation is available for this language, and if so enable it
29+
-- in case there is no indent query, the indentexpr will fallback to the vim's built in one
30+
local has_indent_query = vim.treesitter.query.get(language, 'indent') ~= nil
31+
2832
-- enables treesitter based indentation
29-
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
33+
if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end
3034
end
3135

3236
local available_parsers = require('nvim-treesitter').get_available()

0 commit comments

Comments
 (0)