Merge branch 'nvim-lua:master' into master
This commit is contained in:
		
						commit
						6d095fb18a
					
				
							
								
								
									
										11
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										11
									
								
								init.lua
								
								
								
								
							| 
						 | 
					@ -493,7 +493,9 @@ require('lazy').setup({
 | 
				
			||||||
    'neovim/nvim-lspconfig',
 | 
					    'neovim/nvim-lspconfig',
 | 
				
			||||||
    dependencies = {
 | 
					    dependencies = {
 | 
				
			||||||
      -- Automatically install LSPs and related tools to stdpath for Neovim
 | 
					      -- Automatically install LSPs and related tools to stdpath for Neovim
 | 
				
			||||||
      { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
 | 
					      -- Mason must be loaded before its dependents so we need to set it up here.
 | 
				
			||||||
 | 
					      -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
 | 
				
			||||||
 | 
					      { 'williamboman/mason.nvim', opts = {} },
 | 
				
			||||||
      'williamboman/mason-lspconfig.nvim',
 | 
					      'williamboman/mason-lspconfig.nvim',
 | 
				
			||||||
      'WhoIsSethDaniel/mason-tool-installer.nvim',
 | 
					      'WhoIsSethDaniel/mason-tool-installer.nvim',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -817,13 +819,16 @@ require('lazy').setup({
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      -- Ensure the servers and tools above are installed
 | 
					      -- Ensure the servers and tools above are installed
 | 
				
			||||||
 | 
					      --
 | 
				
			||||||
      -- To check the current status of installed tools and/or manually install
 | 
					      -- To check the current status of installed tools and/or manually install
 | 
				
			||||||
      -- other tools, you can run
 | 
					      -- other tools, you can run
 | 
				
			||||||
      --    :Mason
 | 
					      --    :Mason
 | 
				
			||||||
      --
 | 
					      --
 | 
				
			||||||
      -- You can press `g?` for help in this menu.
 | 
					      -- You can press `g?` for help in this menu.
 | 
				
			||||||
      require('mason').setup()
 | 
					      --
 | 
				
			||||||
 | 
					      -- `mason` had to be setup earlier: to configure its options see the
 | 
				
			||||||
 | 
					      -- `dependencies` table for `nvim-lspconfig` above.
 | 
				
			||||||
 | 
					      --
 | 
				
			||||||
      -- You can add other tools here that you want Mason to install
 | 
					      -- You can add other tools here that you want Mason to install
 | 
				
			||||||
      -- for you, so that they are available from within Neovim.
 | 
					      -- for you, so that they are available from within Neovim.
 | 
				
			||||||
      local ensure_installed = vim.tbl_keys(servers or {})
 | 
					      local ensure_installed = vim.tbl_keys(servers or {})
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue