Resolved conflict
This commit is contained in:
		
						commit
						26a37089b1
					
				
							
								
								
									
										18
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										18
									
								
								init.lua
								
								
								
								
							|  | @ -539,6 +539,14 @@ require('lazy').setup({ | ||||||
|               group = highlight_augroup, |               group = highlight_augroup, | ||||||
|               callback = vim.lsp.buf.clear_references, |               callback = vim.lsp.buf.clear_references, | ||||||
|             }) |             }) | ||||||
|  | 
 | ||||||
|  |             vim.api.nvim_create_autocmd('LspDetach', { | ||||||
|  |               group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), | ||||||
|  |               callback = function(event2) | ||||||
|  |                 vim.lsp.buf.clear_references() | ||||||
|  |                 vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } | ||||||
|  |               end, | ||||||
|  |             }) | ||||||
|           end |           end | ||||||
| 
 | 
 | ||||||
|           -- The following autocommand is used to enable inlay hints in your |           -- The following autocommand is used to enable inlay hints in your | ||||||
|  | @ -553,14 +561,6 @@ require('lazy').setup({ | ||||||
|         end, |         end, | ||||||
|       }) |       }) | ||||||
| 
 | 
 | ||||||
|       vim.api.nvim_create_autocmd('LspDetach', { |  | ||||||
|         group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), |  | ||||||
|         callback = function(event) |  | ||||||
|           vim.lsp.buf.clear_references() |  | ||||||
|           vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event.buf } |  | ||||||
|         end, |  | ||||||
|       }) |  | ||||||
| 
 |  | ||||||
|       -- LSP servers and clients are able to communicate to each other what features they support. |       -- LSP servers and clients are able to communicate to each other what features they support. | ||||||
|       --  By default, Neovim doesn't support everything that is in the LSP specification. |       --  By default, Neovim doesn't support everything that is in the LSP specification. | ||||||
|       --  When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. |       --  When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. | ||||||
|  | @ -881,7 +881,7 @@ require('lazy').setup({ | ||||||
|     'nvim-treesitter/nvim-treesitter', |     'nvim-treesitter/nvim-treesitter', | ||||||
|     build = ':TSUpdate', |     build = ':TSUpdate', | ||||||
|     opts = { |     opts = { | ||||||
|       ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim' }, |       ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, | ||||||
|       -- Autoinstall languages that are not installed |       -- Autoinstall languages that are not installed | ||||||
|       auto_install = true, |       auto_install = true, | ||||||
|       highlight = { |       highlight = { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue