NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-22 21:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #316 from diniamo/fix-autopairs-cr

Browse source 
modules/nvim-cmp: add edge case for autopairs in cr mapping
This commit is contained in:
raf 2024-06-25 09:09:04 +00:00 committed by GitHub
commit 688a457a3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/plugins/autopairs/nvim-autopairs/config.nix
View file

@ -4,7 +4,6 @@
... ...
}: let }: let
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
inherit (lib.strings) optionalString;
inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.lua) toLuaObject;
@ -14,7 +13,7 @@ in {
vim.startPlugins = ["nvim-autopairs"]; vim.startPlugins = ["nvim-autopairs"];
vim.luaConfigRC.autopairs = entryAnywhere '' vim.luaConfigRC.autopairs = entryAnywhere ''
require("nvim-autopairs").setup{} require("nvim-autopairs").setup({ map_cr = ${toLuaObject (!config.vim.autocomplete.enable)} })
''; '';
}; };
} }

20
modules/plugins/completion/nvim-cmp/config.nix
View file

@ -61,15 +61,19 @@ in {
(mkSetLuaBinding mappings.complete '' (mkSetLuaBinding mappings.complete ''
require('cmp').complete require('cmp').complete
'') '')
(mkSetLuaBinding mappings.confirm '' (let
function() defaultKeys =
if not require('cmp').confirm({ select = true }) then if config.vim.autopairs.enable
local termcode = vim.api.nvim_replace_termcodes(${toJSON mappings.confirm.value}, true, false, true) then "require('nvim-autopairs').autopairs_cr()"
else "vim.api.nvim_replace_termcodes(${toJSON mappings.confirm.value}, true, false, true)";
vim.fn.feedkeys(termcode, 'n') in
mkSetLuaBinding mappings.confirm ''
function()
if not require('cmp').confirm({ select = true }) then
vim.fn.feedkeys(${defaultKeys}, 'n')
end
end end
end '')
'')
(mkSetLuaBinding mappings.next '' (mkSetLuaBinding mappings.next ''
function() function()
local has_words_before = function() local has_words_before = function()