oli/nvim
1
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity

Merge branch 'master' of https://git.freiewildbahn.de/oli/nvim

Browse Source
This commit is contained in:
Oliver Hartmann 2022-10-30 12:23:39 +01:00
commit 4b532e698f
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua/my_plugins.lua
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'),
@ -233,10 +234,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'

12
lua/setup/cmp.lua
View File

@ -39,7 +39,7 @@ cmp.setup({
['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c', 's' }), ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c', 's' }),
['<C-e>'] = cmp.mapping(cmp.mapping.close(), { 'i', 'c', 's' }), ['<C-e>'] = cmp.mapping(cmp.mapping.close(), { 'i', 'c', 's' }),
['<CR>'] = cmp.mapping({ ['<CR>'] = cmp.mapping({
i = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true }), i = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = false }),
c = cmp.mapping.confirm({ select = false }), c = cmp.mapping.confirm({ select = false }),
s = cmp.mapping.confirm({ select = false }), s = cmp.mapping.confirm({ select = false }),
}), }),
@ -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,

5
lua/setup/my_dap.lua
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' },
},
})