From a579d34d44758a7625585ecb7343053c2331db9c Mon Sep 17 00:00:00 2001 From: Charles Chiu Date: Tue, 18 Jul 2023 11:53:42 +0800 Subject: [PATCH 01/11] perf(pack): update `nvim-bufdel` lazy-loading events. (#874) Signed-off-by: Charles Chiu --- lua/modules/plugins/editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/modules/plugins/editor.lua b/lua/modules/plugins/editor.lua index 5de346cad..57f7e748c 100644 --- a/lua/modules/plugins/editor.lua +++ b/lua/modules/plugins/editor.lua @@ -36,7 +36,7 @@ editor["LunarVim/bigfile.nvim"] = { } editor["ojroques/nvim-bufdel"] = { lazy = true, - event = "BufReadPre", + cmd = { "BufDel", "BufDelAll", "BufDelOthers" }, } editor["rhysd/clever-f.vim"] = { lazy = true, From 6a9f56eaee19821a37e830510dd463bc425c4410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E9=85=94=E9=96=91=E5=90=9F?= <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 18 Jul 2023 11:55:10 +0800 Subject: [PATCH 02/11] feat(null-ls): usercmd `:NullLsToggle` to toggle sources (#872) * feat(null-ls): usercmd `:NullLsToggle` to toggle sources * feat: notify on error --- lua/modules/configs/completion/null-ls.lua | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lua/modules/configs/completion/null-ls.lua b/lua/modules/configs/completion/null-ls.lua index 68645f393..f957ad6cb 100644 --- a/lua/modules/configs/completion/null-ls.lua +++ b/lua/modules/configs/completion/null-ls.lua @@ -42,5 +42,31 @@ return function() handlers = {}, }) + -- Setup usercmd to register/deregister available source(s) + local function _gen_completion() + local sources_cont = null_ls.get_source({ + filetype = vim.api.nvim_get_option_value("filetype", { scope = "local" }), + }) + local completion_items = {} + for _, server in pairs(sources_cont) do + table.insert(completion_items, server.name) + end + return completion_items + end + vim.api.nvim_create_user_command("NullLsToggle", function(opts) + if vim.tbl_contains(_gen_completion(), opts.args) then + null_ls.toggle({ name = opts.args }) + else + vim.notify( + string.format("[Null-ls] Unable to find any registered source named [%s].", opts.args), + vim.log.levels.ERROR, + { title = "Null-ls Internal Error" } + ) + end + end, { + nargs = 1, + complete = _gen_completion, + }) + require("completion.formatting").configure_format_on_save() end From 8c065c1dbf98e08a8ac1cf80ab698b310f59ba97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E9=85=94=E9=96=91=E5=90=9F?= <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 18 Jul 2023 17:05:43 +0800 Subject: [PATCH 03/11] feat(lspsaga): enable titles for Nvim >=0.9 (#875) --- lua/modules/configs/completion/lspsaga.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/modules/configs/completion/lspsaga.lua b/lua/modules/configs/completion/lspsaga.lua index 47e2fb9ca..0e8d7e967 100644 --- a/lua/modules/configs/completion/lspsaga.lua +++ b/lua/modules/configs/completion/lspsaga.lua @@ -149,7 +149,7 @@ return function() frequency = 12, }, ui = { - title = false, + title = true, devicon = true, border = "single", -- Can be single, double, rounded, solid, shadow. actionfix = icons.ui.Spell, From 7487fb0ae9eb7a64e63d3975e16c32dc3c659fcd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 02:26:55 +0000 Subject: [PATCH 04/11] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 9f25ecd62..762864b64 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,12 +1,12 @@ { "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" }, - "LuaSnip": { "branch": "master", "commit": "45a4e899ca8f54936fe32ead6bba65f2a8d42e12" }, + "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, "accelerated-jk.nvim": { "branch": "main", "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" }, "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" }, "autoclose.nvim": { "branch": "main", "commit": "469782b0456f0b4f764378ffda94c18599544e09" }, "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" }, "bigfile.nvim": { "branch": "main", "commit": "9616b73670ffeb92679677554ded88854ae42cf8" }, - "bufferline.nvim": { "branch": "main", "commit": "09b18b89ad2a2c2258a10bc06747f01bc1a42d0d" }, + "bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" }, "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "1f76a94691b509acb4bf000cd85ba285c4df1c02" }, "clever-f.vim": { "branch": "master", "commit": "6a3ac5e3688598af9411ab741737f98c47370c22" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -23,17 +23,17 @@ "copilot.lua": { "branch": "master", "commit": "e48bd7020a98be217d85c006a298656294fd6210" }, "crates.nvim": { "branch": "main", "commit": "4ce7c51b881e58f1e2f8f437f30e4e583cbac319" }, "csv.vim": { "branch": "master", "commit": "15ff93edf5b26c466affbb356e0696b7d6a3b499" }, - "diffview.nvim": { "branch": "main", "commit": "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c" }, + "diffview.nvim": { "branch": "main", "commit": "285ce7a8c2b2c9ab1e1acddad4e132d656af5815" }, "edge": { "branch": "master", "commit": "358cb6688ac577470a4eafcb53bdd63899dfc937" }, "fidget.nvim": { "branch": "legacy", "commit": "90c22e47be057562ee9566bad313ad42d622c1d3" }, "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "1e01b2958aebb79f1c33e7427a1bac131a678e0d" }, + "gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" }, "hop.nvim": { "branch": "master", "commit": "31e0e42e629bf16affea747132d9c54f55fb17c8" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, "lsp_signature.nvim": { "branch": "master", "commit": "17ff7a405fea8376b015b8ea7910d2e59958bf68" }, - "lspsaga.nvim": { "branch": "main", "commit": "95ec55dfd5355c90f1cee834bd415e1d2b5d9854" }, + "lspsaga.nvim": { "branch": "main", "commit": "adfd5533e4e5627f74bc9896ca8936cede3a26ce" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" }, @@ -49,12 +49,12 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, - "nvim-lspconfig": { "branch": "master", "commit": "ba3ec2527aa7aae9b989d69966174a22b7d1b1dd" }, + "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-scrollview": { "branch": "main", "commit": "9217dba703b43deb0751c08b8e2eeb6dbf2685fd" }, + "nvim-scrollview": { "branch": "main", "commit": "9b0b7aeee68700bc7672dfee186d32089a583332" }, "nvim-tree.lua": { "branch": "master", "commit": "3b62c6bf2c3f2973036aed609d02fd0ca9c3af35" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "44211e7f6e669b8a07e86abc533b292a30c32d62" }, + "nvim-treesitter": { "branch": "master", "commit": "9fa6806b88905d52b5ca36094909630919b432cc" }, "nvim-treesitter-context": { "branch": "master", "commit": "6f8f788738b968f24a108ee599c5be0031f94f06" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, From d0d0859d8b39bb072434abc8c57186341ccddd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E9=85=94=E9=96=91=E5=90=9F?= <50296129+Jint-lzxy@users.noreply.github.com> Date: Fri, 21 Jul 2023 17:30:03 +0800 Subject: [PATCH 05/11] fix(lspkind): `TypeParams` shall be `colors.blue` (FNC) (#883) --- lua/modules/utils/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/modules/utils/init.lua b/lua/modules/utils/init.lua index 0c8634663..57bb46da1 100644 --- a/lua/modules/utils/init.lua +++ b/lua/modules/utils/init.lua @@ -185,7 +185,7 @@ function M.gen_lspkind_hl() Package = colors.blue, Property = colors.teal, Struct = colors.yellow, - TypeParameter = colors.maroon, + TypeParameter = colors.blue, Variable = colors.peach, Array = colors.peach, Boolean = colors.peach, From d425bfdc4f4d1f36d0ac1b452a58ef83f055ce20 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Jul 2023 01:56:00 +0000 Subject: [PATCH 06/11] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 762864b64..20661e711 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -7,7 +7,7 @@ "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" }, "bigfile.nvim": { "branch": "main", "commit": "9616b73670ffeb92679677554ded88854ae42cf8" }, "bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" }, - "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "1f76a94691b509acb4bf000cd85ba285c4df1c02" }, + "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "d9989a56380f4c30f8fda41eb9a9ac0932d4f383" }, "clever-f.vim": { "branch": "master", "commit": "6a3ac5e3688598af9411ab741737f98c47370c22" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, @@ -23,23 +23,23 @@ "copilot.lua": { "branch": "master", "commit": "e48bd7020a98be217d85c006a298656294fd6210" }, "crates.nvim": { "branch": "main", "commit": "4ce7c51b881e58f1e2f8f437f30e4e583cbac319" }, "csv.vim": { "branch": "master", "commit": "15ff93edf5b26c466affbb356e0696b7d6a3b499" }, - "diffview.nvim": { "branch": "main", "commit": "285ce7a8c2b2c9ab1e1acddad4e132d656af5815" }, + "diffview.nvim": { "branch": "main", "commit": "e91110d2a7f8e2f667666aba6ea089ff823f8748" }, "edge": { "branch": "master", "commit": "358cb6688ac577470a4eafcb53bdd63899dfc937" }, "fidget.nvim": { "branch": "legacy", "commit": "90c22e47be057562ee9566bad313ad42d622c1d3" }, - "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, + "friendly-snippets": { "branch": "main", "commit": "4aed1a0ca605cb1c87f59799a0cc4afe00a40272" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" }, "hop.nvim": { "branch": "master", "commit": "31e0e42e629bf16affea747132d9c54f55fb17c8" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, - "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, + "lazy.nvim": { "branch": "main", "commit": "ed15f6b39422f46412212005f6d12c6f353b0293" }, "lsp_signature.nvim": { "branch": "master", "commit": "17ff7a405fea8376b015b8ea7910d2e59958bf68" }, - "lspsaga.nvim": { "branch": "main", "commit": "adfd5533e4e5627f74bc9896ca8936cede3a26ce" }, + "lspsaga.nvim": { "branch": "main", "commit": "15913e9cfcab51de2477a911ca63e9cd1ba78c02" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, - "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, + "mason.nvim": { "branch": "main", "commit": "3f6b544c75c01549f7a2a9e395e0f1cea42b25dd" }, "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, "nord.nvim": { "branch": "master", "commit": "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f" }, @@ -49,12 +49,12 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, - "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, + "nvim-lspconfig": { "branch": "master", "commit": "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-scrollview": { "branch": "main", "commit": "9b0b7aeee68700bc7672dfee186d32089a583332" }, + "nvim-scrollview": { "branch": "main", "commit": "f74fa963249f5924871f6aff6dddf180fc4a130d" }, "nvim-tree.lua": { "branch": "master", "commit": "3b62c6bf2c3f2973036aed609d02fd0ca9c3af35" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "9fa6806b88905d52b5ca36094909630919b432cc" }, + "nvim-treesitter": { "branch": "master", "commit": "a8ac8419c420f3564e5212ecbeba3283cfa9e78e" }, "nvim-treesitter-context": { "branch": "master", "commit": "6f8f788738b968f24a108ee599c5be0031f94f06" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, @@ -64,7 +64,7 @@ "persisted.nvim": { "branch": "main", "commit": "b03c863731eafacd973912383297ea5d8fdb006a" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "c6c2bda90f9f2d9eb047400f9153893d425bfa3c" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "4aa076b065af3c34d9d6540c133369782243706e" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "smartyank.nvim": { "branch": "master", "commit": "7e3905578f646503525b2f7018b8afd17861018c" }, "sniprun": { "branch": "master", "commit": "28d55eeb6786a7037fd3564ced8296a71f1cece7" }, @@ -77,7 +77,7 @@ "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" }, "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" }, + "telescope.nvim": { "branch": "master", "commit": "7bb2fcecdcfe7d7975c0e59c276033740cd45d38" }, "toggleterm.nvim": { "branch": "main", "commit": "00c13dccc78c09fa5da4c5edda990a363e75035e" }, "trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" }, "vim-cool": { "branch": "master", "commit": "04bb7f5dade175a81b47abf4e87aeb30b05b33d8" }, @@ -85,7 +85,7 @@ "vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" }, "vim-go": { "branch": "master", "commit": "12de6c0bc0efce3cedc5e28d4fe0ecc3a4aaeb77" }, "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" }, - "vim-matchup": { "branch": "master", "commit": "17cc05867cb3314761e4baa20115a27120f8e82c" }, + "vim-matchup": { "branch": "master", "commit": "ca8971739e3908973c5912cb3a0ffb6cf7bd83e7" }, "which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } } \ No newline at end of file From 381f8fb2d3055be3791b9839daa929eb2a7e08b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E9=85=94=E9=96=91=E5=90=9F?= <50296129+Jint-lzxy@users.noreply.github.com> Date: Sun, 23 Jul 2023 17:36:47 +0800 Subject: [PATCH 07/11] chore(treesitter): cleanup (#891) --- lua/modules/configs/editor/treesitter.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lua/modules/configs/editor/treesitter.lua b/lua/modules/configs/editor/treesitter.lua index daf713b9a..2ee63f399 100644 --- a/lua/modules/configs/editor/treesitter.lua +++ b/lua/modules/configs/editor/treesitter.lua @@ -70,11 +70,6 @@ return vim.schedule_wrap(function() }, }, }, - rainbow = { - enable = true, - extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean - max_file_lines = 2000, -- Do not enable for files with more than 2000 lines, int - }, context_commentstring = { enable = true, enable_autocmd = false }, matchup = { enable = true }, }) From b44d0152207cd0d9e03e79294b1e28771edea209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E9=85=94=E9=96=91=E5=90=9F?= <50296129+Jint-lzxy@users.noreply.github.com> Date: Sun, 23 Jul 2023 19:33:57 +0800 Subject: [PATCH 08/11] perf(lsp_signature): fix input delay (#890) * perf(lsp_signature): fix input delay * fix typo --- lua/core/settings.lua | 2 +- lua/modules/plugins/completion.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/core/settings.lua b/lua/core/settings.lua index 9a88cd7c6..866de013c 100644 --- a/lua/core/settings.lua +++ b/lua/core/settings.lua @@ -40,7 +40,7 @@ settings["load_big_files_faster"] = true -- Settings will complete their replacement at initialization. -- Parameters will be automatically completed as you type. -- Example: { sky = "#04A5E5" } ----@type palette +---@type palette[] settings["palette_overwrite"] = {} -- Set the colorscheme to use here. diff --git a/lua/modules/plugins/completion.lua b/lua/modules/plugins/completion.lua index 759137bca..db882eb47 100644 --- a/lua/modules/plugins/completion.lua +++ b/lua/modules/plugins/completion.lua @@ -8,7 +8,7 @@ completion["neovim/nvim-lspconfig"] = { { "williamboman/mason.nvim" }, { "williamboman/mason-lspconfig.nvim" }, { - "ray-x/lsp_signature.nvim", + "Jint-lzxy/lsp_signature.nvim", config = require("completion.lsp-signature"), }, }, From 65bc19f8a031c5a603ab8efef12a4159c3ee2071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E9=85=94=E9=96=91=E5=90=9F?= <50296129+Jint-lzxy@users.noreply.github.com> Date: Mon, 24 Jul 2023 07:12:37 +0800 Subject: [PATCH 09/11] feat(lualine): add icon for PyEnv (#892) --- lua/modules/configs/ui/lualine.lua | 4 ++-- lua/modules/utils/icons.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/modules/configs/ui/lualine.lua b/lua/modules/configs/ui/lualine.lua index ea09ef778..04d28c755 100644 --- a/lua/modules/configs/ui/lualine.lua +++ b/lua/modules/configs/ui/lualine.lua @@ -209,11 +209,11 @@ return function() if vim.api.nvim_get_option_value("filetype", { scope = "local" }) == "python" then local venv = os.getenv("CONDA_DEFAULT_ENV") if venv then - return string.format("%s", env_cleanup(venv)) + return icons.misc.PyEnv .. env_cleanup(venv) end venv = os.getenv("VIRTUAL_ENV") if venv then - return string.format("%s", env_cleanup(venv)) + return icons.misc.PyEnv .. env_cleanup(venv) end end return "" diff --git a/lua/modules/utils/icons.lua b/lua/modules/utils/icons.lua index 91671d06c..b344530f3 100644 --- a/lua/modules/utils/icons.lua +++ b/lua/modules/utils/icons.lua @@ -150,7 +150,7 @@ local data = { Gavel = "", Glass = "󰂖", NoActiveLsp = "󱚧", - PyEnv = "󰌠", + PyEnv = "󰢩", Squirrel = "", Tag = "", Tree = "", From 6de8afe0fc4a6e53a9d64a013327d5482b6dbe99 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 01:58:12 +0000 Subject: [PATCH 10/11] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 20661e711..d4cbe569d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -31,9 +31,9 @@ "gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" }, "hop.nvim": { "branch": "master", "commit": "31e0e42e629bf16affea747132d9c54f55fb17c8" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, - "lazy.nvim": { "branch": "main", "commit": "ed15f6b39422f46412212005f6d12c6f353b0293" }, - "lsp_signature.nvim": { "branch": "master", "commit": "17ff7a405fea8376b015b8ea7910d2e59958bf68" }, - "lspsaga.nvim": { "branch": "main", "commit": "15913e9cfcab51de2477a911ca63e9cd1ba78c02" }, + "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, + "lsp_signature.nvim": { "branch": "master", "commit": "b36080555e393402bc9484ce0e60d8b6cd23d426" }, + "lspsaga.nvim": { "branch": "main", "commit": "d3ac8b98f207ef355ab968726996702f7ce41b99" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, @@ -51,12 +51,12 @@ "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-lspconfig": { "branch": "master", "commit": "dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-scrollview": { "branch": "main", "commit": "f74fa963249f5924871f6aff6dddf180fc4a130d" }, - "nvim-tree.lua": { "branch": "master", "commit": "3b62c6bf2c3f2973036aed609d02fd0ca9c3af35" }, + "nvim-scrollview": { "branch": "main", "commit": "c0dc4822e0b87d10569c55d7189c6147ad03538b" }, + "nvim-tree.lua": { "branch": "master", "commit": "273c1700eb68c27dce4e518efafc8144fd7ce4ab" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "a8ac8419c420f3564e5212ecbeba3283cfa9e78e" }, + "nvim-treesitter": { "branch": "master", "commit": "7b04e8b67eec7d92daadf9f0717dd272ddfc81a3" }, "nvim-treesitter-context": { "branch": "master", "commit": "6f8f788738b968f24a108ee599c5be0031f94f06" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ef32a5c24b767d165ed63fd2b24ac8dc52742521" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" }, "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, @@ -64,10 +64,10 @@ "persisted.nvim": { "branch": "main", "commit": "b03c863731eafacd973912383297ea5d8fdb006a" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "4aa076b065af3c34d9d6540c133369782243706e" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "5db37600becf689d78dbf066545b0de4d6f0ab94" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "smartyank.nvim": { "branch": "master", "commit": "7e3905578f646503525b2f7018b8afd17861018c" }, - "sniprun": { "branch": "master", "commit": "28d55eeb6786a7037fd3564ced8296a71f1cece7" }, + "sniprun": { "branch": "master", "commit": "4762952f3d206d41eedb789e10741de75d1391a3" }, "specs.nvim": { "branch": "main", "commit": "2743e412bbe21c9d73954c403d01e8de7377890d" }, "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, @@ -77,9 +77,9 @@ "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" }, "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "7bb2fcecdcfe7d7975c0e59c276033740cd45d38" }, + "telescope.nvim": { "branch": "master", "commit": "1228f3b15ca3d9b95dcb92efda6a3448871030bd" }, "toggleterm.nvim": { "branch": "main", "commit": "00c13dccc78c09fa5da4c5edda990a363e75035e" }, - "trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" }, + "trouble.nvim": { "branch": "main", "commit": "0e6703c1d37d2d34ed029ab54f9bd66e3f2ecbf7" }, "vim-cool": { "branch": "master", "commit": "04bb7f5dade175a81b47abf4e87aeb30b05b33d8" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, "vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" }, From acfc2f44e261c4b5a55e28273b7dc93a83dc849f Mon Sep 17 00:00:00 2001 From: MiSumiSumi Date: Wed, 26 Jul 2023 21:36:39 +0900 Subject: [PATCH 11/11] fix(provider): leave provider specifications to user (#887) * add(settings): dont_set_python_host_prog option * fix(provider): leave provider specifications to user * remove unused code --------- Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/core/options.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lua/core/options.lua b/lua/core/options.lua index 47d7f427d..7545f48e4 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -103,18 +103,22 @@ local function load_options() wrapscan = true, writebackup = false, } + local function isempty(s) return s == nil or s == "" end + local function use_if_defined(val, fallback) + return val ~= nil and val or fallback + end -- custom python provider local conda_prefix = os.getenv("CONDA_PREFIX") if not isempty(conda_prefix) then - vim.g.python_host_prog = conda_prefix .. "/bin/python" - vim.g.python3_host_prog = conda_prefix .. "/bin/python" + vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, conda_prefix .. "/bin/python") + vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, conda_prefix .. "/bin/python") else - vim.g.python_host_prog = "python" - vim.g.python3_host_prog = "python3" + vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, "python") + vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, "python3") end for name, value in pairs(global_local) do