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

lua/my_plugins.lua

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

lua/setup/cmp.lua

@@ -39,7 +39,7 @@ cmp.setup({
     ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c', 's' }),
     ['<C-e>'] = cmp.mapping(cmp.mapping.close(), { 'i', 'c', 's' }),
     ['<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 }),
       s = cmp.mapping.confirm({ select = false }),
     }),
@@ -83,6 +83,10 @@ cmp.setup({
     -- { name = 'spell' },
     -- { 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' },
   sorting = {
     comparators = {
@@ -117,6 +121,12 @@ cmp.setup.cmdline(':', {
   }),
 })
 
+require('cmp').setup.filetype({ 'dap-repl', 'dapui_watches', 'dapui_hover' }, {
+  sources = {
+    { name = 'dap' },
+  },
+})
+
 -- Autopairs
 --require("nvim-autopairs.completion.cmp").setup({
 --    map_cr = true,

lua/setup/my_dap.lua

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