From ae17b321c7fc95e8c678865368ebfcac7c2e7483 Mon Sep 17 00:00:00 2001 From: Giovanny Gongora Date: Mon, 16 Sep 2024 08:46:52 +0200 Subject: [PATCH 01/10] fix(extra): make copilot-chat.lua fallback to the latest model (#4411) ## Description CopilotChat upgraded to gpt-4o early in August https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/2c4d2954f9b56945dc8d053903b16759d08f9f37 but the LazyVim plugin is still running with opts of gpt-4. I thought about changing model to the latest here, but I feel this means more maintainability for an option which generally is expected to point to the latest model, and the upstream opts of CopilotChat seem to keep up with that already. ## Related Issue(s) None ## Screenshots None ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/extras/coding/copilot-chat.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/lazyvim/plugins/extras/coding/copilot-chat.lua b/lua/lazyvim/plugins/extras/coding/copilot-chat.lua index 7eb2d666..fd58b857 100644 --- a/lua/lazyvim/plugins/extras/coding/copilot-chat.lua +++ b/lua/lazyvim/plugins/extras/coding/copilot-chat.lua @@ -23,7 +23,6 @@ return { local user = vim.env.USER or "User" user = user:sub(1, 1):upper() .. user:sub(2) return { - model = "gpt-4", auto_insert_mode = true, show_help = true, question_header = " " .. user .. " ", From 746ea8f1e6afdad89d0fab4ad04f370cf3998f67 Mon Sep 17 00:00:00 2001 From: Benjamin Memisevic <132348240+MemiMem@users.noreply.github.com> Date: Mon, 16 Sep 2024 08:47:31 +0200 Subject: [PATCH 02/10] fix(grug): grug_far -> grug.open (#4404) ## Description Just a very simple fix to use the updated method in grug to set the options for the dependency. Just ran across the issue debuging search and replace on my setup (was not the issue). This is not breaking. ## Related Issue(s) N/A ## Screenshots N/A ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua index 18ded3ae..a57d9aeb 100644 --- a/lua/lazyvim/plugins/editor.lua +++ b/lua/lazyvim/plugins/editor.lua @@ -137,7 +137,7 @@ return { function() local grug = require("grug-far") local ext = vim.bo.buftype == "" and vim.fn.expand("%:e") - grug.grug_far({ + grug.open({ transient = true, prefills = { filesFilter = ext and ext ~= "" and "*." .. ext or nil, From 4cb12312cfa39b38760aab6c060eefca651ab83f Mon Sep 17 00:00:00 2001 From: folke Date: Mon, 16 Sep 2024 06:47:53 +0000 Subject: [PATCH 03/10] chore(build): auto-generate docs --- doc/LazyVim.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt index 902f7a94..5c658123 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim Last change: 2024 August 31 +*LazyVim.txt* For Neovim Last change: 2024 September 16 ============================================================================== Table of Contents *LazyVim-table-of-contents* From ead5955befe8d6e1e06877ea923c78375dcfad1e Mon Sep 17 00:00:00 2001 From: moetayuko Date: Wed, 18 Sep 2024 14:16:29 +0800 Subject: [PATCH 04/10] feat(vscode): make use of vscode builtin terminal (#4392) ## Description make use of vscode builtin terminal **I don't know how to properly handle cwd so it's implemented as a simple toggle** ## Related Issue(s) #4280 ## Checklist - [X] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/extras/vscode.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lua/lazyvim/plugins/extras/vscode.lua b/lua/lazyvim/plugins/extras/vscode.lua index 98a22205..a272d2ce 100644 --- a/lua/lazyvim/plugins/extras/vscode.lua +++ b/lua/lazyvim/plugins/extras/vscode.lua @@ -33,11 +33,15 @@ vim.api.nvim_create_autocmd("User", { pattern = "LazyVimKeymapsDefaults", callback = function() vim.keymap.set("n", "", "Find") - vim.keymap.set("n", "/", [[call VSCodeNotify('workbench.action.findInFiles')]]) - vim.keymap.set("n", "ss", [[call VSCodeNotify('workbench.action.gotoSymbol')]]) + vim.keymap.set("n", "/", [[lua require('vscode').action('workbench.action.findInFiles')]]) + vim.keymap.set("n", "ss", [[lua require('vscode').action('workbench.action.gotoSymbol')]]) end, }) +function LazyVim.terminal() + require("vscode").action("workbench.action.terminal.toggleTerminal") +end + return { { "LazyVim/LazyVim", From d67be9a9fb7b5ad7d450ebd97a8dbb34415bfdb2 Mon Sep 17 00:00:00 2001 From: folke Date: Wed, 18 Sep 2024 06:17:33 +0000 Subject: [PATCH 05/10] chore(build): auto-generate docs --- doc/LazyVim.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt index 5c658123..f7962147 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim Last change: 2024 September 16 +*LazyVim.txt* For Neovim Last change: 2024 September 18 ============================================================================== Table of Contents *LazyVim-table-of-contents* From 86d4f14bc89b2174cadde93a4f49fc83a01df642 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Wed, 18 Sep 2024 08:20:01 +0200 Subject: [PATCH 06/10] feat(cmp): better c-n and c-p mapping fallback. Fixes #4414 --- lua/lazyvim/plugins/coding.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index 8b982033..8529ab20 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -33,6 +33,8 @@ return { mapping = cmp.mapping.preset.insert({ [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), + [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), [""] = cmp.mapping.complete(), [""] = LazyVim.cmp.confirm({ select = auto_select }), [""] = LazyVim.cmp.confirm({ select = true }), From 6dcd9794b1819965eb4f3dca70a1eb3c463de3cf Mon Sep 17 00:00:00 2001 From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:20:43 +0300 Subject: [PATCH 07/10] fix(ocaml): get_language_id (#4327) ## Description This fixes the error users get from local function `get_language_id`. From looking into [nvim-lspconfig ocamllsp](https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/server_configurations/ocamllsp.lua) and other googling around, namely [tjdevries config files](https://github.com/tjdevries/config.nvim/blob/9b790b90c1ac68cf7e60d6537baf9395523d6b01/lua/custom/plugins/lsp.lua#L108-L115) and [another one](https://github.com/nyinyithann/neovim-ocaml/blob/e31c0d61fd78a2d367bacfae2886629a2c7a88d7/nvim/after/plugin/lspconfig.lua#L67), it seems that we can directly set these as filetypes foregoing the mapping via the additional local function which would also need the [nvim-lspconfig language_id mapping](https://github.com/neovim/nvim-lspconfig/blob/d4814330b207a4e05ba9515e453b0e87f20357ec/lua/lspconfig/server_configurations/ocamllsp.lua#L3-L10). Please bear in mind I don't do any Ocaml, so it would be great if other users who do Ocaml could test this PR. ## Related Issue(s) Closes #4326 ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/extras/lang/ocaml.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lua/lazyvim/plugins/extras/lang/ocaml.lua b/lua/lazyvim/plugins/extras/lang/ocaml.lua index d4485856..83f72a72 100644 --- a/lua/lazyvim/plugins/extras/lang/ocaml.lua +++ b/lua/lazyvim/plugins/extras/lang/ocaml.lua @@ -18,9 +18,14 @@ return { opts = { servers = { ocamllsp = { - get_language_id = function(_, ftype) - return language_id_of[ftype] - end, + filetypes = { + "ocaml", + "ocaml.menhir", + "ocaml.interface", + "ocaml.ocamllex", + "reason", + "dune", + }, root_dir = function(fname) return require("lspconfig.util").root_pattern( "*.opam", From 627215a72b7744973a778722724d07eccefa0c79 Mon Sep 17 00:00:00 2001 From: bilabila Date: Wed, 18 Sep 2024 14:22:05 +0800 Subject: [PATCH 08/10] fix(vue): ensure css treesitter installed (#4308) ## Description If css treesitter is not installed(the current),