setup cmp-dap correctly

This commit is contained in:
Oliver Hartmann 2022-10-28 23:10:11 +02:00
parent 476205ce47
commit 8c672f19db
3 changed files with 11 additions and 9 deletions

View File

@ -104,6 +104,7 @@ return require('packer').startup(function()
{ 'ray-x/cmp-treesitter' }, { 'ray-x/cmp-treesitter' },
{ 'hrsh7th/cmp-nvim-lsp-signature-help' }, { 'hrsh7th/cmp-nvim-lsp-signature-help' },
{ 'p00f/clangd_extensions.nvim' }, { 'p00f/clangd_extensions.nvim' },
{ 'rcarriga/cmp-dap' },
}, },
as = 'cmp', as = 'cmp',
config = get_setup('cmp'), config = get_setup('cmp'),
@ -237,10 +238,6 @@ return require('packer').startup(function()
module = 'telescope._extensions.dap', module = 'telescope._extensions.dap',
requires = 'telescope.nvim', requires = 'telescope.nvim',
}, },
{
'rcarriga/cmp-dap',
requires = 'cmp'
},
{ {
'rcarriga/nvim-dap-ui', 'rcarriga/nvim-dap-ui',
module = 'dapui' module = 'dapui'

View File

@ -83,6 +83,10 @@ cmp.setup({
-- { name = 'spell' }, -- { name = 'spell' },
-- { name = 'emoji' }, -- { name = 'emoji' },
}, },
enabled = function()
return vim.api.nvim_buf_get_option(0, "buftype") ~= "prompt"
or require("cmp_dap").is_dap_buffer()
end,
completion = { completeopt = 'menu,menuone,noinsert, noselect' }, completion = { completeopt = 'menu,menuone,noinsert, noselect' },
sorting = { sorting = {
comparators = { comparators = {
@ -117,6 +121,12 @@ cmp.setup.cmdline(':', {
}), }),
}) })
require('cmp').setup.filetype({ 'dap-repl', 'dapui_watches', 'dapui_hover' }, {
sources = {
{ name = 'dap' },
},
})
-- Autopairs -- Autopairs
--require("nvim-autopairs.completion.cmp").setup({ --require("nvim-autopairs.completion.cmp").setup({
-- map_cr = true, -- map_cr = true,

View File

@ -154,9 +154,4 @@ dap.configurations.cpp = {
require('nvim-dap-virtual-text').setup() require('nvim-dap-virtual-text').setup()
require('telescope').load_extension('dap') require('telescope').load_extension('dap')
require('cmp').setup.filetype({ 'dap-repl', 'dapui_watches', 'dapui_hover' }, {
sources = {
{ name = 'dap' },
},
})