Skip to content

Commit 198460c

Browse files
committed
Merge 'upstream' nvim-lspconfig cmp-nvim-lsp, treesitter prefer_git
Add explicit dependency of nvim-lspconfig on cmp-nvim-lsp Remove treesitter prefer_git option
2 parents 0a274ab + 1860184 commit 198460c

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

lua/kickstart/plugins/lspconfig.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ return {
2525
-- Useful status updates for LSP.
2626
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
2727
{ 'j-hui/fidget.nvim', opts = {} },
28+
29+
-- Allows extra capabilities provided by nvim-cmp
30+
'hrsh7th/cmp-nvim-lsp',
2831
},
2932
config = function()
3033
-- Brief aside: **What is LSP?**

lua/kickstart/plugins/treesitter.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ return {
1818
config = function(_, opts)
1919
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
2020

21-
-- Prefer git instead of curl in order to improve connectivity in some environments
22-
require('nvim-treesitter.install').prefer_git = true
2321
---@diagnostic disable-next-line: missing-fields
2422
require('nvim-treesitter.configs').setup(opts)
2523

0 commit comments

Comments
 (0)