Skip to content

Commit 5f1905e

Browse files
AIMacGyverclaude
andcommitted
merge: sync upstream kickstart changes (treesitter indent fallback)
- Keep local treesitter parser list (go, python, ts, sql, docker, etc.) - Take upstream's has_indent_query guard (PR nvim-lua#1988 bug fix) - Keep local lint.lua (markdownlint-cli2 + golangcilint) - Auto-merged: neo-tree filtered_items removal, gitsigns comment update, treesitter auto-install on file open Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2 parents ada83c0 + c0cc054 commit 5f1905e

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

init.lua

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,8 +939,17 @@ require('lazy').setup({
939939
-- enables syntax highlighting and other treesitter features
940940
vim.treesitter.start(buf, language)
941941

942+
-- enables treesitter based folds
943+
-- for more info on folds see `:help folds`
944+
-- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
945+
-- vim.wo.foldmethod = 'expr'
946+
947+
-- check if treesitter indentation is available for this language, and if so enable it
948+
-- in case there is no indent query, the indentexpr will fallback to the vim's built in one
949+
local has_indent_query = vim.treesitter.query.get(language, 'indent') ~= nil
950+
942951
-- enables treesitter based indentation
943-
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
952+
if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end
944953
end
945954

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

0 commit comments

Comments
 (0)