Update treesitter

This commit is contained in:
Thomas Avé 2025-12-18 11:58:02 +01:00
parent 97fdade25e
commit 9fd61a06c1
2 changed files with 33 additions and 63 deletions

View File

@ -37,6 +37,7 @@ in
"eDP-1,2880x1800@120.00Hz,480x0,1.2,vrr,1"
"DP-1,1920x1080,6240x500,1"
"HDMI-A-1,3840x2160@60.00Hz,0x-2160,1"
"DP-3,1920x1080,3840x-540,1"
];
bind = [
", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${

View File

@ -1,68 +1,37 @@
return {
'nvim-treesitter/nvim-treesitter',
dependencies = {
"luckasRanarison/tree-sitter-hyprlang",
"nvim-treesitter/nvim-treesitter-textobjects",
},
build = ":TSUpdate",
config = function ()
require("nvim-treesitter.configs").setup({
ensure_installed = { "typst", "cpp", "c", "lua", "vim", "dockerfile", "python", "java", "cmake", "diff", "gitcommit", "html", "css", "javascript", "json", "rust", "sql", "yaml", "markdown", "markdown_inline", "nix", "bibtex" },
auto_install = true,
highlight = {
enable = true,
sync_install = true,
additional_vim_regex_highlighting = false,
disable = function(lang, buf) -- Disable if file size is too big
if lang == "ini" or lang == "markdown" then
return true
end
local max_filesize = 2000 * 1024 -- 2MB
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then
return true
end
end,
},
indent = {
enable = true
},
textobjects = {
select = {
enable = true,
lookahead = true,
keymaps = {
-- You can use the capture groups defined in textobjects.scm
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
["as"] = { query = "@local.scope", query_group = "locals", desc = "Select language scope" },
},
-- You can choose the select mode (default is charwise 'v')
--
-- Can also be a function which gets passed a table with the keys
-- * query_string: eg '@function.inner'
-- * method: eg 'v' or 'o'
-- and should return the mode ('v', 'V', or '<c-v>') or a table
-- mapping query_strings to modes.
selection_modes = {
['@parameter.outer'] = 'v', -- charwise
['@function.outer'] = 'V', -- linewise
['@class.outer'] = '<c-v>', -- blockwise
},
-- If you set this to `true` (default is `false`) then any textobject is
-- extended to include preceding or succeeding whitespace. Succeeding
-- whitespace has priority in order to act similarly to eg the built-in
-- `ap`.
--
-- Can also be a function which gets passed a table with the keys
-- * query_string: eg '@function.inner'
-- * selection_mode: eg 'v'
-- and should return true or false
include_surrounding_whitespace = false,
},
},
-- branch = 'main', -- This is the default now
lazy = false,
config = function()
-- 1. Install Parsers
require('nvim-treesitter').install({
"typst", "cpp", "c", "lua", "vim", "dockerfile", "python", "java",
"cmake", "diff", "gitcommit", "html", "css", "javascript", "json",
"rust", "sql", "yaml", "markdown", "markdown_inline", "nix", "bibtex"
})
-- 2. Enable Highlighting via Autocmd
vim.api.nvim_create_autocmd('FileType', {
callback = function(args)
-- Disable logic (ini, markdown, or large files)
local ft = vim.bo[args.buf].filetype
if ft == "ini" or ft == "markdown" then return end
local max_filesize = 2000 * 1024 -- 2MB
local ok, stats = pcall(vim.uv.fs_stat, vim.api.nvim_buf_get_name(args.buf))
if ok and stats and stats.size > max_filesize then return end
-- Enable highlighting
vim.treesitter.start()
end,
})
-- 3. Enable Indentation
vim.api.nvim_create_autocmd('FileType', {
pattern = '*',
callback = function()
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
end
})
end,
}