vim: Fix some completion bugs

See: - hrsh7th/nvim-cmp#1860 (comment) - hrsh7th/cmp-omni#9
liskin · Aug 21, 2024 · 96b032b · 96b032b
1 parent fbb45a6
commit 96b032b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.config/nvim/lua/init/plug_cmp.lua b/.config/nvim/lua/init/plug_cmp.lua
@@ -142,6 +142,7 @@ cmp.setup {
 			cmp.abort()
 			fallback()
 		end,
+		['<CR>'] = cmp_or(cmp.confirm),
 		['<C-N>'] = cmp_or(cmp_select_next, cmp_complete_buffer_all),
 		['<C-P>'] = cmp_or(cmp_select_prev, cmp_complete_buffer_all),
 		['<C-X><C-N>'] = cmp_or(cmp_select_next, cmp_complete_buffer_current),
@@ -152,7 +153,7 @@ cmp.setup {
 	confirmation = {
 		get_commit_characters = function(commit_characters)
 			return {
-				' ', '\r',
+				' ',
 				'.', ',',
 				':', ';',
 				'(', ')',

diff --git a/.gitmodules b/.gitmodules
@@ -131,7 +131,8 @@
 	url = https://github.com/nvim-lua/plenary.nvim
 [submodule ".local/share/nvim/site/bundle/nvim-cmp"]
 	path = .local/share/nvim/site/bundle/nvim-cmp
-	url = https://github.com/hrsh7th/nvim-cmp
+	# url = https://github.com/hrsh7th/nvim-cmp
+	url = https://github.com/liskin/nvim-cmp
 [submodule ".local/share/nvim/site/bundle/cmp-cmdline"]
 	path = .local/share/nvim/site/bundle/cmp-cmdline
 	url = https://github.com/hrsh7th/cmp-cmdline

diff --git a/.local/share/nvim/site/bundle/nvim-cmp b/.local/share/nvim/site/bundle/nvim-cmp
+1 −1		lua/cmp/config.lua
+3 −1		lua/cmp/config/compare.lua
+1 −1		lua/cmp/config/default.lua
+1 −1		lua/cmp/context.lua
+6 −0		lua/cmp/init.lua
+3 −1		lua/cmp/types/lsp.lua
+1 −1		lua/cmp/utils/api.lua
+5 −2		lua/cmp/utils/feedkeys.lua
+5 −3		lua/cmp/utils/misc.lua
+7 −0		lua/cmp/view.lua
+10 −4		lua/cmp/view/custom_entries_view.lua
+14 −3		lua/cmp/view/ghost_text_view.lua
+12 −5		lua/cmp/view/native_entries_view.lua
+9 −2		lua/cmp/view/wildmenu_entries_view.lua