From f1ba3cfeb67d686e6e0b3aeb24428bf95d5a7775 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Sun, 8 Dec 2024 15:34:13 -0800 Subject: [PATCH] feat: lib.lazyvim.ui.foldexpr -> nvim_treesitter#foldexpr --- nvim/lua/lib/lazyvim/ui.lua | 19 ------------------- nvim/lua/options.lua | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/nvim/lua/lib/lazyvim/ui.lua b/nvim/lua/lib/lazyvim/ui.lua index d869398..cd79af6 100644 --- a/nvim/lua/lib/lazyvim/ui.lua +++ b/nvim/lua/lib/lazyvim/ui.lua @@ -3,25 +3,6 @@ ---@class lib.lazyvim.ui local M = {} --- Optimized treesitter foldexpr for Neovim >= 0.10.0 -function M.foldexpr() - local buf = vim.api.nvim_get_current_buf() - if vim.b[buf].ts_folds == nil then - -- as long as we don't have a filetype, don't bother checking if treesitter - -- is available (it won't be) - if vim.bo[buf].filetype == '' then - return '0' - end - if vim.bo[buf].filetype:find('dashboard') then - vim.b[buf].ts_folds = false - else - vim.b[buf].ts_folds = pcall(vim.treesitter.get_parser, buf) - end - end - - return vim.b[buf].ts_folds and vim.treesitter.foldexpr() or '0' -end - ---@return {fg?:string}? function M.fg(name) local hl = vim.api.nvim_get_hl(0, { name = name, link = false }) diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua index 434b5d9..dfea37a 100644 --- a/nvim/lua/options.lua +++ b/nvim/lua/options.lua @@ -70,7 +70,7 @@ opt.foldcolumn = '1' opt.foldlevel = 99 opt.foldenable = true opt.foldmethod = 'expr' -opt.foldexpr = "v:lua.require'lib.lazyvim.ui'.foldtext()" +opt.foldexpr = 'nvim_treesitter#foldexpr()' opt.foldtext = '' -- Always keep 4 lines above/below cursor.