From b4fd6c19885d056b9dcb03f7faac79c5e604151f Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 31 Mar 2026 14:15:12 +0100 Subject: [PATCH] Fixing treesitter --- lua/plugins/treesitter.lua | 37 ++++++++++++++++--------------------- lua/snippets/javascript.lua | 2 +- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 66edc49..cb54b6b 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,11 +1,12 @@ -- Highlight, edit, and navigate code return { 'nvim-treesitter/nvim-treesitter', + branch = 'main', build = ':TSUpdate', - main = 'nvim-treesitter.configs', -- Sets main module to use for opts + lazy = false, -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - opts = { - ensure_installed = { + config = function() + local langs = { 'bash', 'c', 'diff', @@ -17,22 +18,16 @@ return { 'query', 'vim', 'vimdoc', - }, - -- Autoinstall languages that are not installed - auto_install = true, - highlight = { - enable = true, - -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. - -- If you are experiencing weird indenting issues, add the language to - -- the list of additional_vim_regex_highlighting and disabled languages for indent. - additional_vim_regex_highlighting = { 'ruby' }, - }, - indent = { enable = true, disable = { 'ruby' } }, - }, - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + 'php', + 'yaml', + } + require('nvim-treesitter').install(langs) + + vim.api.nvim_create_autocmd('FileType', { + pattern = langs, + callback = function() + vim.treesitter.start() + end, + }) + end, } diff --git a/lua/snippets/javascript.lua b/lua/snippets/javascript.lua index e75792f..909ce50 100644 --- a/lua/snippets/javascript.lua +++ b/lua/snippets/javascript.lua @@ -43,7 +43,7 @@ return { s(etr('return ', 'Add semicolon after return'), fmta('return #~;', { i(0) })), s(etr('rt ', 'return alias'), fmta('return #~;', { i(0) })), - s(etr('const', 'const declaration'), { + s(etr('const ', 'const declaration'), { c(1, { sn(nil, fmta('const #~ = #~;', { i(1, 'variableName'), i(2, 'value') })), sn(