Merge branch 'nvim-lua:master' into master
This commit is contained in:
		
						commit
						4427c1b912
					
				
							
								
								
									
										17
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										17
									
								
								init.lua
								
								
								
								
							| 
						 | 
				
			
			@ -588,6 +588,15 @@ require('lazy').setup({
 | 
			
		|||
        end,
 | 
			
		||||
      })
 | 
			
		||||
 | 
			
		||||
      -- Change diagnostic symbols in the sign column (gutter)
 | 
			
		||||
      -- if vim.g.have_nerd_font then
 | 
			
		||||
      --   local signs = { Error = '', Warn = '', Hint = '', Info = '' }
 | 
			
		||||
      --   for type, icon in pairs(signs) do
 | 
			
		||||
      --     local hl = 'DiagnosticSign' .. type
 | 
			
		||||
      --     vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
 | 
			
		||||
      --   end
 | 
			
		||||
      -- end
 | 
			
		||||
 | 
			
		||||
      -- 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.
 | 
			
		||||
      --  When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
 | 
			
		||||
| 
						 | 
				
			
			@ -907,7 +916,7 @@ require('lazy').setup({
 | 
			
		|||
    --    - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
 | 
			
		||||
  -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
 | 
			
		||||
  -- init.lua. If you want these files, they are in the repository, so you can just download them and
 | 
			
		||||
  -- place them in the correct locations.
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -927,8 +936,12 @@ require('lazy').setup({
 | 
			
		|||
  --    This is the easiest way to modularize your config.
 | 
			
		||||
  --
 | 
			
		||||
  --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
 | 
			
		||||
  --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
 | 
			
		||||
  -- { import = 'custom.plugins' },
 | 
			
		||||
  --
 | 
			
		||||
  -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
 | 
			
		||||
  -- Or use telescope!
 | 
			
		||||
  -- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
 | 
			
		||||
  -- you can continue same window with `<space>sr` which resumes last telescope search
 | 
			
		||||
}, {
 | 
			
		||||
  ui = {
 | 
			
		||||
    -- If you are using a Nerd Font: set icons to an empty table which will use the
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -89,6 +89,18 @@ return {
 | 
			
		|||
      },
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    -- Change breakpoint icons
 | 
			
		||||
    -- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' })
 | 
			
		||||
    -- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' })
 | 
			
		||||
    -- local breakpoint_icons = vim.g.have_nerd_font
 | 
			
		||||
    --     and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' }
 | 
			
		||||
    --   or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' }
 | 
			
		||||
    -- for type, icon in pairs(breakpoint_icons) do
 | 
			
		||||
    --   local tp = 'Dap' .. type
 | 
			
		||||
    --   local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak'
 | 
			
		||||
    --   vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl })
 | 
			
		||||
    -- end
 | 
			
		||||
 | 
			
		||||
    dap.listeners.after.event_initialized['dapui_config'] = dapui.open
 | 
			
		||||
    dap.listeners.before.event_terminated['dapui_config'] = dapui.close
 | 
			
		||||
    dap.listeners.before.event_exited['dapui_config'] = dapui.close
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -47,7 +47,12 @@ return {
 | 
			
		|||
      vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
 | 
			
		||||
        group = lint_augroup,
 | 
			
		||||
        callback = function()
 | 
			
		||||
          lint.try_lint()
 | 
			
		||||
          -- Only run the linter in buffers that you can modify in order to
 | 
			
		||||
          -- avoid superfluous noise, notably within the handy LSP pop-ups that
 | 
			
		||||
          -- describe the hovered symbol using Markdown.
 | 
			
		||||
          if vim.opt_local.modifiable:get() then
 | 
			
		||||
            lint.try_lint()
 | 
			
		||||
          end
 | 
			
		||||
        end,
 | 
			
		||||
      })
 | 
			
		||||
    end,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue