Merge branch 'nvim-lua:master' into master
This commit is contained in:
		
						commit
						c975e0346a
					
				| 
						 | 
					@ -64,6 +64,9 @@ This will automatically install `nvim-autopairs` and enable it on startup. For m
 | 
				
			||||||
In the file: `lua/custom/plugins/filetree.lua`, add:
 | 
					In the file: `lua/custom/plugins/filetree.lua`, add:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
```lua
 | 
					```lua
 | 
				
			||||||
 | 
					-- Unless you are still migrating, remove the deprecated commands from v1.x
 | 
				
			||||||
 | 
					vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
return {
 | 
					return {
 | 
				
			||||||
  "nvim-neo-tree/neo-tree.nvim",
 | 
					  "nvim-neo-tree/neo-tree.nvim",
 | 
				
			||||||
  version = "*",
 | 
					  version = "*",
 | 
				
			||||||
| 
						 | 
					@ -73,9 +76,6 @@ return {
 | 
				
			||||||
    "MunifTanjim/nui.nvim",
 | 
					    "MunifTanjim/nui.nvim",
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  config = function ()
 | 
					  config = function ()
 | 
				
			||||||
    -- Unless you are still migrating, remove the deprecated commands from v1.x
 | 
					 | 
				
			||||||
    vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    require('neo-tree').setup {}
 | 
					    require('neo-tree').setup {}
 | 
				
			||||||
  end,
 | 
					  end,
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										8
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										8
									
								
								init.lua
								
								
								
								
							| 
						 | 
					@ -356,10 +356,10 @@ require('nvim-treesitter.configs').setup {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Diagnostic keymaps
 | 
					-- Diagnostic keymaps
 | 
				
			||||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
 | 
					vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
 | 
				
			||||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
 | 
					vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
 | 
				
			||||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
 | 
					vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
 | 
				
			||||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
 | 
					vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- LSP settings.
 | 
					-- LSP settings.
 | 
				
			||||||
--  This function gets run when an LSP connects to a particular buffer.
 | 
					--  This function gets run when an LSP connects to a particular buffer.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue