Skip to content

Commit 8270c91

Browse files
BiboursMogztomasgareaudam9000nhlddiorman
authored
Chore : UPstream update (#5)
* fix: prevent mason setup from being run twice (nvim-lua#1298) * fix: prevent mason setup from being run twice Addresses nvim-lua#1297 Currently, we're calling `require('mason').setup(...)` twice: * once when setting it as a dependency of `nvim-lspconfig` (since we set `config = true`) * once in the `config` function we define for `nvim-lspconfig` Calling setup twice can cause issues with, e.g., setting the `PATH` option: you might append Mason's bin dir in one setup call and prepend it in the other. We've kept the setup of `mason` in the `nvim-lspconfig` dependencies table since leaving it to the `config` function caused some plugin-loading-order related issues in the past. See: * nvim-lua#210 * nvim-lua#554 * nvim-lua#555 * nvim-lua#865 * docs: tweak comments per review feedback * chore: remove redundant comment (nvim-lua#1307) * chore: fix typo in bug report issue template (nvim-lua#1306) * Use luals 3rd library for luv (nvim-lua#1303) * Modifies the treesitter config to make it work on my computers. * Disables the focus movement keymaps. Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Adds my prefences for the options. Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Configures Telescope layout to my liking Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Adds additional custom configuration Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Enables custom plugins sourcing and changes the colorscheme plugin Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Adds highlight commands for diagnostics Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Updates DelphiLsp to use current buffer path. Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Adds linebreak config * Tries to not lauch DelphiLsp when not on Windows * Deactivates neo-tree plugin. Signed-off-by: Bibours <antmaugas+github@gmail.com> * Adds vim-fugitive plugin. Signed-off-by: Bibours <antmaugas+github@gmail.com> * Adds buffer as source completion. Signed-off-by: Bibours <antmaugas+github@gmail.com> * Adds lazygit front end plugin. * Corrects the OS detection for delphi LSP. Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Minor modifications to personal options. Signed-off-by: AMaugas <antoine.maugas@braindex.fr> * Upstream update (#3) * which-key v3 update (nvim-lua#1022) * which-key v3 update * remove unneeded brackets from which-key registration * fix(lazy): added error handling for bootstrap (nvim-lua#1001) * fix: add required parsers from nvim-treesitter * Fix neo-tree keymap description (nvim-lua#932) The lazy.nvim keys parameter does not need the `desc` to be inside a table in the way that vim.keymap.set() does. With this fix the keymap description will be properly shown for example in telescope keymap search * Remove redundant require (nvim-lua#959) * Make debug lazy loadable (nvim-lua#978) * Update README.md | %userprofile%\appdata\local -> %localappdata% (nvim-lua#963) - Replace `%userprofile%\AppData\Local\nvim\` and `$env:USERPROFILE\AppData\Local\nvim` to `%localappdata%\nvim` and `$env:LOCALAPPDATA\nvim respectfully` * Make conform.nvim be lazy-loadable again (nvim-lua#977) The PR that disabled lazy loading (nvim-lua#818) was to fix plugin not being loaded before write. This sets up lazy to load conform before write. * Fix comment about mini.ai example (nvim-lua#985) This example wasn't using `'` so this makes more sense * Neovim 0.10 updates (nvim-lua#936) * Neovim 0.10 updates Provide the buffer for which to enable inlay hints Co-authored-by: Matt Mirus <matt@mattmirus.com> * refactor: replace vim.loop with vim.uv * Upgrade folke/neodev (sunsetting) to folke/lazydev * Update checkhealth for 0.10 release --------- Co-authored-by: Matt Mirus <matt@mattmirus.com> Co-authored-by: mrr11k <me+github@mrr11k.dev> Co-authored-by: Seb Tomasini <sebt@qgates.com> * Update lazydev config to fix "Undefined field `fs_stat`" LSP error (nvim-lua#1040) 7513ec8 switched from neodev to lazydev, but in the process it introduced an LSP error in `init.lua`, which degrades the desired "first timer" experience of kickstart.nvim. This commit follows the configuration suggested in https://github.com/folke/lazydev.nvim/tree/6184ebbbc8045d70077659b7d30c705a588dc62f#-installation which resolves the LSP error. * lint: fix lsp warning in `vim.lsp.inlay_hint.is_enabled` (nvim-lua#947) * fix: lsp warning * review suggestion Co-authored-by: Tom Kuson <mail@tjkuson.me> --------- Co-authored-by: Tom Kuson <mail@tjkuson.me> * Update comment about the toggle inlay hints keymap (nvim-lua#1041) * Remove redundant hlsearch option (nvim-lua#1058) * Modify conform comments to prevent deprecation warning when used (nvim-lua#1057) * refactor: remove lazydev and luvit-meta as lsp dependencies (nvim-lua#1047) * performance: defer clipboard because xsel and pbcopy can be slow (nvim-lua#1049) * Remove treesitter prefer_git option (nvim-lua#1061) - It's not safe and can corrupt other git repos - nvim-treesiter maintainers consider `prefer_git` as deprecated and no longer needed. See nvim-treesitter PR for details: nvim-treesitter/nvim-treesitter#6959 * Add explicit dependency of nvim-lspconfig on cmp-nvim-lsp (nvim-lua#1042) * Update README.md (nvim-lua#1091) * Add note in README about lazy-lock.json (nvim-lua#1090) * Check for loop or uv for lazypath (nvim-lua#1095) * refactor: update treesitter and which-key config (nvim-lua#1068) * Include visual mode in LSP code action keymap (nvim-lua#1060) (nvim-lua#1064) * Enable silent option for default neo-tree plugin keybinding (nvim-lua#1108) * Fix: updated the windows installation commands (nvim-lua#1101) * Update README.md * Update README.md * Fix: updated the windows installation commands * fix: remove deprecated opt for conform.nvim (nvim-lua#1070) - changed lsp_fallback -> lsp_format - updated format_on_save function to reflect change above * cleanup: refactor which-key configuration for cleaner setup (nvim-lua#1102) - Moved `which-key` configuration from inline `config` to `opts` for better organization. - Updated the key mappings setup to use `spec` for defining existing key chains. - Removed deprecated or unnecessary comments and code. This change aligns with updated `which-key` configuration practices, improving readability and maintainability as recommended by @VlaDexa in nvim-lua#1068. * Fix the which-key spec issue caused by recent cleanup (nvim-lua#1113) The recent cleanup accidentally broke the leader key specs because the spec block was in the wrong level of braces. That resulted in which-key no longer showing the description of the <leader> key chains such as [S]earch and others. * feat: update references of tsserver to ts_ls (nvim-lua#1131) * fix: update lazy uninstall information link (nvim-lua#1148) * Disable linting autocmd for readonly buffers (nvim-lua#1202) * Disable linting autocmd for readonly buffers This should avoid linting in buffers outside of the user's control, having in mind especially the handy LSP pop-ups that describe your hovered symbol using markdown. Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> * Justify guarding try_lint in readonly buffers Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> --------- Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> * samarth-nagar fix: lazy help tag on line 931 (nvim-lua#1167) * samarth-nagar fix: lazy help tag on line 931 found in issue nvim-lua#1152 * fixed white space --------- Co-authored-by: sam <110125971+samarth-nagar@users.noreply.github.com> * Change diagnostic symbols if vim.g.have_nerd_font is true (nvim-lua#1195) * feat: Change diagnostic symbols if vim.g.have_nerd_font is true * feat: Comment out changes regarding diagnostic symbols so that only those who want to change them can do so --------- Co-authored-by: name <email> * Set breakpoint icons and their highlight colors (nvim-lua#1194) * feat: Set breakpoint icons and their highlight colors * docs: Delete reference URL (written in PR) feat: "Break" and "Stop" arguments of vim.api.nvim_set_hl are changed because they are too common nouns feat: Comment out changes regarding diagnostic symbols so that only those who want to change them can do so --------- Co-authored-by: name <email> * Remove two because there are more than two. (nvim-lua#1213) * feat: Change to prepare for upcoming deprecation of configuring diagnostic-signs using sign_define() (nvim-lua#1232) * Fix nvim-dap not lazy loading (nvim-lua#1216) * Fix nvim-dap not lazy loading The keys property had local variables 'dap' and 'dap-ui' that used `require` and prevented all DAP related plugins from lazy-loading. Fixed this by changing keys to a table and substituting the local variables with a lamba function * Make debug keybind descriptions more consistent * fix: which-key comment typo (nvim-lua#1227) --------- Co-authored-by: Vladislav Grechannik <52157081+VlaDexa@users.noreply.github.com> Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com> Co-authored-by: Damjan 9000 <damjan.9000@gmail.com> Co-authored-by: TJ DeVries <devries.timothyj@gmail.com> Co-authored-by: Tom Kuson <mail@tjkuson.me> Co-authored-by: Artyom <84637383+MZhuvka@users.noreply.github.com> Co-authored-by: Richard Macklin <1863540+rmacklin@users.noreply.github.com> Co-authored-by: Matt Mirus <matt@mattmirus.com> Co-authored-by: mrr11k <me+github@mrr11k.dev> Co-authored-by: Seb Tomasini <sebt@qgates.com> Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com> Co-authored-by: Arvin Verain <arvinverain@proton.me> Co-authored-by: Brandon Clark <bwclark97@gmail.com> Co-authored-by: Ihsan Tonuzi <115842560+iton0@users.noreply.github.com> Co-authored-by: abeldekat <58370433+abeldekat@users.noreply.github.com> Co-authored-by: jstrot <44594069+jstrot@users.noreply.github.com> Co-authored-by: theoboldalex <44616505+theoboldalex@users.noreply.github.com> Co-authored-by: Matt Gallagher <46973220+mattgallagher92@users.noreply.github.com> Co-authored-by: Michael L. <m@lehenauer.com> Co-authored-by: Bayram Kazik <48856944+bayramkzk@users.noreply.github.com> Co-authored-by: Harshit Pant <97608579+pantharshit007@users.noreply.github.com> Co-authored-by: Nicolás Baquero <88566759+Cheveniko@users.noreply.github.com> Co-authored-by: Bastien Traverse <neitsab@esrevart.net> Co-authored-by: Éric NICOLAS <ccjmne@gmail.com> Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> Co-authored-by: sam <110125971+samarth-na@users.noreply.github.com> Co-authored-by: sam <110125971+samarth-nagar@users.noreply.github.com> Co-authored-by: gloomy-lemon-debatable <91877885+gloomy-lemon-debatable@users.noreply.github.com> Co-authored-by: Will Winder <wwinder.unh@gmail.com> Co-authored-by: Anjishnu Banerjee <107052359+kaezrr@users.noreply.github.com> Co-authored-by: Miha <79801427+mihasket@users.noreply.github.com> Co-authored-by: mogz <mogz@deBibouan.home> --------- Signed-off-by: AMaugas <antoine.maugas@braindex.fr> Signed-off-by: Bibours <antmaugas+github@gmail.com> Co-authored-by: Tomas Gareau <tggareau@gmail.com> Co-authored-by: Damjan 9000 <damjan.9000@gmail.com> Co-authored-by: Nhan Luu <62146587+nhld@users.noreply.github.com> Co-authored-by: Diorman Colmenares <229201+diorman@users.noreply.github.com> Co-authored-by: AMaugas <antoine.maugas@braindex.fr> Co-authored-by: Vladislav Grechannik <52157081+VlaDexa@users.noreply.github.com> Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com> Co-authored-by: TJ DeVries <devries.timothyj@gmail.com> Co-authored-by: Tom Kuson <mail@tjkuson.me> Co-authored-by: Artyom <84637383+MZhuvka@users.noreply.github.com> Co-authored-by: Richard Macklin <1863540+rmacklin@users.noreply.github.com> Co-authored-by: Matt Mirus <matt@mattmirus.com> Co-authored-by: mrr11k <me+github@mrr11k.dev> Co-authored-by: Seb Tomasini <sebt@qgates.com> Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com> Co-authored-by: Arvin Verain <arvinverain@proton.me> Co-authored-by: Brandon Clark <bwclark97@gmail.com> Co-authored-by: Ihsan Tonuzi <115842560+iton0@users.noreply.github.com> Co-authored-by: abeldekat <58370433+abeldekat@users.noreply.github.com> Co-authored-by: jstrot <44594069+jstrot@users.noreply.github.com> Co-authored-by: theoboldalex <44616505+theoboldalex@users.noreply.github.com> Co-authored-by: Matt Gallagher <46973220+mattgallagher92@users.noreply.github.com> Co-authored-by: Michael L. <m@lehenauer.com> Co-authored-by: Bayram Kazik <48856944+bayramkzk@users.noreply.github.com> Co-authored-by: Harshit Pant <97608579+pantharshit007@users.noreply.github.com> Co-authored-by: Nicolás Baquero <88566759+Cheveniko@users.noreply.github.com> Co-authored-by: Bastien Traverse <neitsab@esrevart.net> Co-authored-by: Éric NICOLAS <ccjmne@gmail.com> Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com> Co-authored-by: sam <110125971+samarth-na@users.noreply.github.com> Co-authored-by: sam <110125971+samarth-nagar@users.noreply.github.com> Co-authored-by: gloomy-lemon-debatable <91877885+gloomy-lemon-debatable@users.noreply.github.com> Co-authored-by: Will Winder <wwinder.unh@gmail.com> Co-authored-by: Anjishnu Banerjee <107052359+kaezrr@users.noreply.github.com> Co-authored-by: Miha <79801427+mihasket@users.noreply.github.com> Co-authored-by: mogz <mogz@deBibouan.home>
1 parent 8ab4aa6 commit 8270c91

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ assignees: ''
1111

1212
## Before Reporting an Issue
1313
- I have read the kickstart.nvim README.md.
14-
- I have read the appropiate plugin's documentation.
14+
- I have read the appropriate plugin's documentation.
1515
- I have searched that this issue has not been reported before.
1616

1717
- [ ] **By checking this, I confirm that the above steps are completed. I understand leaving this unchecked will result in this report being closed immediately.**

lua/kickstart/plugins/lspconfig.lua

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ return {
88
opts = {
99
library = {
1010
-- Load luvit types when the `vim.uv` word is found
11-
{ path = 'luvit-meta/library', words = { 'vim%.uv' } },
11+
{ path = '${3rd}/luv/library', words = { 'vim%.uv' } },
1212
},
1313
},
1414
},
15-
{ 'Bilal2453/luvit-meta', lazy = true },
1615
{
1716
-- Main LSP Configuration
1817
'neovim/nvim-lspconfig',
1918
dependencies = {
2019
-- Automatically install LSPs and related tools to stdpath for Neovim
21-
{ 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
20+
-- Mason must be loaded before its dependents so we need to set it up here.
21+
-- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
22+
{ 'williamboman/mason.nvim', opts = {} },
2223
'williamboman/mason-lspconfig.nvim',
2324
'WhoIsSethDaniel/mason-tool-installer.nvim',
2425

2526
-- Useful status updates for LSP.
26-
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
2727
{ 'j-hui/fidget.nvim', opts = {} },
2828

2929
-- Allows extra capabilities provided by nvim-cmp
@@ -207,13 +207,16 @@ return {
207207
}
208208

209209
-- Ensure the servers and tools above are installed
210-
-- To check the current status of installed tools and/or manually install
211-
-- other tools, you can run
210+
--
211+
-- To check the current status of installed tools and/or manually install
212+
-- other tools, you can run
212213
-- :Mason
213214
--
214-
-- You can press `g?` for help in this menu.
215-
require('mason').setup()
216-
215+
-- You can press `g?` for help in this menu.
216+
--
217+
-- `mason` had to be setup earlier: to configure its options see the
218+
-- `dependencies` table for `nvim-lspconfig` above.
219+
--
217220
-- You can add other tools here that you want Mason to install
218221
-- for you, so that they are available from within Neovim.
219222
local ensure_installed = vim.tbl_keys(servers or {})

0 commit comments

Comments
 (0)