[nvim] smart-pairs and nvim-cmp compatibility

ZhiyuanLck/smart-pairs#2 (comment)
odrling · Feb 28, 2022 · 8cf0e32 · 8cf0e32
1 parent 133c5b5
commit 8cf0e32
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/.config/nvim/lua/config/lsp.lua b/.config/nvim/lua/config/lsp.lua
@@ -69,10 +69,11 @@ cmp.setup {
     ['<C-f>'] = cmp.mapping.scroll_docs(4),
     ['<C-Space>'] = cmp.mapping.complete(),
     ['<C-e>'] = cmp.mapping.close(),
-    ['<CR>'] = cmp.mapping.confirm {
-      behavior = cmp.ConfirmBehavior.Replace,
-      select = true,
-    },
+    ["<CR>"] = cmp.mapping(function(fallback)
+      if not cmp.confirm({ select = false }) then
+        require("pairs.enter").type()
+      end
+    end),
     ['<Tab>'] = function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
@@ -99,6 +100,16 @@ cmp.setup {
   },
 }
 
+local kind = cmp.lsp.CompletionItemKind
+
+cmp.event:on("confirm_done", function(event)
+  local item = event.entry:get_completion_item()
+  local parensDisabled = item.data and item.data.funcParensDisabled or false
+  if not parensDisabled and (item.kind == kind.Method or item.kind == kind.Function) then
+    require("pairs.bracket").type_left("(")
+  end
+end)
+
 local saga = require 'lspsaga'
 saga.init_lsp_saga()
 

diff --git a/.config/nvim/packer.vim b/.config/nvim/packer.vim
@@ -155,7 +155,15 @@ require('packer').startup {
           require('Comment').setup()
       end
     }
-    use {'ZhiyuanLck/smart-pairs', event = 'InsertEnter', config = function() require('pairs'):setup() end}
+    use {'ZhiyuanLck/smart-pairs',
+        event = 'InsertEnter',
+        config = function()
+            require('pairs'):setup({
+                enter = {
+                    enable_mapping = false
+                }
+            })
+        end}
     use 'tpope/vim-repeat'
     use 'tpope/vim-surround'
     use 'kenn7/vim-arsync'