From ecebcfe40c1039c0ffba571f61e106d1a7986ef9 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Thu, 4 Apr 2024 12:16:40 +0700 Subject: [PATCH] add: update patch file --- lazy-lock.json | 17 ++- lua/custom/plugins/cmdline.lua | 11 +- lua/custom/plugins/nvimufo.lua | 206 ++++++++++++++++----------------- 3 files changed, 119 insertions(+), 115 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 78335f7..4cadfaf 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,23 +10,23 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "e40f651e98a0a12fcd44bf54a2ed258cfee5a914" }, - "codeium.vim": { "branch": "main", "commit": "bef9cbaa5c19ab85d8048f364bfc0ac8c7ab335d" }, + "codeium.vim": { "branch": "main", "commit": "76790ba8d1b8b3287f72366ea5f55c1d76e6114e" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, - "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, + "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, - "lsp-progress.nvim": { "branch": "main", "commit": "1c37b1cd0611563a767f0a340d61f265c4c54ecd" }, + "lsp-progress.nvim": { "branch": "main", "commit": "83b16a9791fa788c0a7ca90374118ed15d2c09ed" }, "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" }, "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "4d1b26b963edb82c45ed261d988f9e72253c3469" }, - "none-ls.nvim": { "branch": "main", "commit": "18910d09d21d7df339805343bfe4a2b2e41c057b" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "f0746bf4f1a21d6e1d2002f671fb9b46d2146de7" }, + "none-ls.nvim": { "branch": "main", "commit": "0d42ba8d506242b2252d2d2885a7f6f4f5b2bcb2" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, - "nvim-cmp": { "branch": "main", "commit": "7aa3f71932c419d716290e132cacbafbaf5bea1c" }, + "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-material-icon": { "branch": "main", "commit": "602088c2682e61cbebd7191de7dc88bfa90c6890" }, @@ -38,14 +38,11 @@ "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, - "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, - "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" }, - "telescope.nvim": { "branch": "master", "commit": "1bb28df3cfc241b961331f00dcb8d5b45fe3e4f0" }, + "telescope.nvim": { "branch": "master", "commit": "4626aaa2bcfdacf55fd6d44b430e2df81b2403ff" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, diff --git a/lua/custom/plugins/cmdline.lua b/lua/custom/plugins/cmdline.lua index 6945986..e2e4539 100644 --- a/lua/custom/plugins/cmdline.lua +++ b/lua/custom/plugins/cmdline.lua @@ -15,7 +15,7 @@ return { dependencies = { { "MunifTanjim/nui.nvim", enabled = use_noice }, }, - -- event = "BufWinEnter", + event = "BufWinEnter", opts = { messages = { enabled = false, @@ -36,7 +36,13 @@ return { }, }, init = function() - require("lazy").load({ plugins = { "noice.nvim" } }) + -- load if mode command mode + -- vim.api.nvim_create_autocmd("CmdlineEnter", { + -- callback = function() + -- require("lazy").load({ plugins = { "noice.nvim" } }) + -- end, + -- }) + -- require("lazy").load({ plugins = { "noice.nvim" } }) end, keys = { { @@ -97,6 +103,7 @@ return { { "hrsh7th/cmp-cmdline", event = "VeryLazy", + enabled = use_noice, config = function() local cmp = require("cmp") local mapping = { diff --git a/lua/custom/plugins/nvimufo.lua b/lua/custom/plugins/nvimufo.lua index 064172b..cea902a 100644 --- a/lua/custom/plugins/nvimufo.lua +++ b/lua/custom/plugins/nvimufo.lua @@ -1,105 +1,105 @@ return { - "kevinhwang91/nvim-ufo", - dependencies = { - "kevinhwang91/promise-async", - { - "luukvbaal/statuscol.nvim", - config = function() - local builtin = require("statuscol.builtin") - require("statuscol").setup({ - -- relculright = true, - -- segments = { - -- { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, - -- { text = { "%s" }, click = "v:lua.ScSa" }, - -- { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, - -- }, - setopt = true, - relculright = true, - segments = { - { text = { "%s" }, click = "v:lua.ScSa" }, - { - text = { builtin.foldfunc }, - condition = { builtin.not_empty, true, builtin.not_empty }, - click = "v:lua.ScFa", - }, - { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, - }, - }) - end, - }, - }, - lazy = true, - -- event = "BufReadPost", - event = "BufWinEnter", - config = function() - vim.o.foldcolumn = "1" -- '0' is not bad - vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value - vim.o.foldlevelstart = 99 - vim.o.foldenable = true - -- vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] - vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] - - -- these are "extra", change them as you like - vim.keymap.set("n", "zR", require("ufo").openAllFolds) - vim.keymap.set("n", "zM", require("ufo").closeAllFolds) - vim.cmd("highlight FoldColumn guifg=" .. vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("Comment")), "fg")) - -- Option 3: treesitter as a main provider instead - -- Only depend on `nvim-treesitter/queries/filetype/folds.scm`, - -- performance and stability are better than `foldmethod=nvim_treesitter#foldexpr()` - require("ufo").setup({ - -- provider_selector = function(bufnr, filetype, buftype) - -- return { "treesitter", "indent" } - -- end, - open_fold_hl_timeout = 150, - - preview = { - win_config = { - border = { "", "─", "", "", "", "─", "", "" }, - -- winhighlight = 'Normal:Normal', - -- winhighlight = 'IncSearch:Folded', - winhighlight = "Normal:UfoPreviewNormal,FloatBorder:UfoPreviewBorder,CursorLine:UfoPreviewCursorLine", - winblend = 0, - }, - mappings = { - scrollU = "", - scrollD = "", - jumpTop = "[", - jumpBot = "]", - }, - }, - provider_selector = function(_, filetype) - return { "treesitter", "indent" } - end, - fold_virt_text_handler = function(virt_text, lnum, end_lnum, width, truncate) - local result = {} - local _end = end_lnum - 1 - local final_text = vim.trim(vim.api.nvim_buf_get_text(0, _end, 0, _end, -1, {})[1]) - local suffix = final_text:format(end_lnum - lnum) - local suffix_width = vim.fn.strdisplaywidth(suffix) - local target_width = width - suffix_width - local cur_width = 0 - for _, chunk in ipairs(virt_text) do - local chunk_text = chunk[1] - local chunk_width = vim.fn.strdisplaywidth(chunk_text) - if target_width > cur_width + chunk_width then - table.insert(result, chunk) - else - chunk_text = truncate(chunk_text, target_width - cur_width) - local hl_group = chunk[2] - table.insert(result, { chunk_text, hl_group }) - chunk_width = vim.fn.strdisplaywidth(chunk_text) - -- str width returned from truncate() may less than 2nd argument, need padding - if cur_width + chunk_width < target_width then - suffix = suffix .. (" "):rep(target_width - cur_width - chunk_width) - end - break - end - cur_width = cur_width + chunk_width - end - table.insert(result, { " ⋯ ", "NonText" }) - table.insert(result, { suffix, "TSPunctBracket" }) - return result - end, - }) - end, + -- "kevinhwang91/nvim-ufo", + -- dependencies = { + -- "kevinhwang91/promise-async", + -- { + -- "luukvbaal/statuscol.nvim", + -- config = function() + -- local builtin = require("statuscol.builtin") + -- require("statuscol").setup({ + -- -- relculright = true, + -- -- segments = { + -- -- { text = { builtin.foldfunc }, click = "v:lua.ScFa" }, + -- -- { text = { "%s" }, click = "v:lua.ScSa" }, + -- -- { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, + -- -- }, + -- setopt = true, + -- relculright = true, + -- segments = { + -- { text = { "%s" }, click = "v:lua.ScSa" }, + -- { + -- text = { builtin.foldfunc }, + -- condition = { builtin.not_empty, true, builtin.not_empty }, + -- click = "v:lua.ScFa", + -- }, + -- { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" }, + -- }, + -- }) + -- end, + -- }, + -- }, + -- lazy = true, + -- -- event = "BufReadPost", + -- event = "BufWinEnter", + -- config = function() + -- vim.o.foldcolumn = "1" -- '0' is not bad + -- vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value + -- vim.o.foldlevelstart = 99 + -- vim.o.foldenable = true + -- -- vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] + -- vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] + -- + -- -- these are "extra", change them as you like + -- vim.keymap.set("n", "zR", require("ufo").openAllFolds) + -- vim.keymap.set("n", "zM", require("ufo").closeAllFolds) + -- vim.cmd("highlight FoldColumn guifg=" .. vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("Comment")), "fg")) + -- -- Option 3: treesitter as a main provider instead + -- -- Only depend on `nvim-treesitter/queries/filetype/folds.scm`, + -- -- performance and stability are better than `foldmethod=nvim_treesitter#foldexpr()` + -- require("ufo").setup({ + -- -- provider_selector = function(bufnr, filetype, buftype) + -- -- return { "treesitter", "indent" } + -- -- end, + -- open_fold_hl_timeout = 150, + -- + -- preview = { + -- win_config = { + -- border = { "", "─", "", "", "", "─", "", "" }, + -- -- winhighlight = 'Normal:Normal', + -- -- winhighlight = 'IncSearch:Folded', + -- winhighlight = "Normal:UfoPreviewNormal,FloatBorder:UfoPreviewBorder,CursorLine:UfoPreviewCursorLine", + -- winblend = 0, + -- }, + -- mappings = { + -- scrollU = "", + -- scrollD = "", + -- jumpTop = "[", + -- jumpBot = "]", + -- }, + -- }, + -- provider_selector = function(_, filetype) + -- return { "treesitter", "indent" } + -- end, + -- fold_virt_text_handler = function(virt_text, lnum, end_lnum, width, truncate) + -- local result = {} + -- local _end = end_lnum - 1 + -- local final_text = vim.trim(vim.api.nvim_buf_get_text(0, _end, 0, _end, -1, {})[1]) + -- local suffix = final_text:format(end_lnum - lnum) + -- local suffix_width = vim.fn.strdisplaywidth(suffix) + -- local target_width = width - suffix_width + -- local cur_width = 0 + -- for _, chunk in ipairs(virt_text) do + -- local chunk_text = chunk[1] + -- local chunk_width = vim.fn.strdisplaywidth(chunk_text) + -- if target_width > cur_width + chunk_width then + -- table.insert(result, chunk) + -- else + -- chunk_text = truncate(chunk_text, target_width - cur_width) + -- local hl_group = chunk[2] + -- table.insert(result, { chunk_text, hl_group }) + -- chunk_width = vim.fn.strdisplaywidth(chunk_text) + -- -- str width returned from truncate() may less than 2nd argument, need padding + -- if cur_width + chunk_width < target_width then + -- suffix = suffix .. (" "):rep(target_width - cur_width - chunk_width) + -- end + -- break + -- end + -- cur_width = cur_width + chunk_width + -- end + -- table.insert(result, { " ⋯ ", "NonText" }) + -- table.insert(result, { suffix, "TSPunctBracket" }) + -- return result + -- end, + -- }) + -- end, }