@@ -4,19 +4,12 @@ return {
44 cmd = {
55 " AvanteAsk" ,
66 " AvanteBuild" ,
7- " AvanteConflictChooseAllTheirs" ,
8- " AvanteConflictChooseBase" ,
9- " AvanteConflictChooseBoth" ,
10- " AvanteConflictChooseCursor" ,
11- " AvanteConflictChooseNone" ,
12- " AvanteConflictChooseOurs" ,
13- " AvanteConflictChooseTheirs" ,
14- " AvanteConflictListQf" ,
15- " AvanteConflictNextConflict" ,
16- " AvanteConflictPrevConflict" ,
177 " AvanteEdit" ,
188 " AvanteRefresh" ,
199 " AvanteSwitchProvider" ,
10+ " AvanteChat" ,
11+ " AvanteToggle" ,
12+ " AvanteClear" ,
2013 },
2114 dependencies = {
2215 " stevearc/dressing.nvim" ,
@@ -39,29 +32,24 @@ return {
3932 maps .v [prefix .. " e" ] = { function () require (" avante.api" ).edit () end , desc = " Avante edit" }
4033
4134 -- the following key bindings do not have an official api implementation
42- maps .n .co = { " :AvanteConflictChooseOurs<CR> " , desc = " Choose ours" }
43- maps .v .co = { " :AvanteConflictChooseOurs<CR> " , desc = " Choose ours" }
35+ maps .n .co = { " <Plug>(AvanteConflictOurs) " , desc = " Choose ours" , expr = true }
36+ maps .v .co = { " <Plug>(AvanteConflictOurs) " , desc = " Choose ours" , expr = true }
4437
45- maps .n .ct = { " :AvanteConflictChooseTheirs<CR> " , desc = " Choose theirs" }
46- maps .v .ct = { " :AvanteConflictChooseTheirs<CR> " , desc = " Choose theirs" }
38+ maps .n .ct = { " <Plug>(AvanteConflictTheirs) " , desc = " Choose theirs" , expr = true }
39+ maps .v .ct = { " <Plug>(AvanteConflictTheirs) " , desc = " Choose theirs" , expr = true }
4740
48- maps .n .ca = { " :AvanteConflictChooseAllTheirs<CR> " , desc = " Choose all theirs" }
49- maps .v .ca = { " :AvanteConflictChooseAllTheirs<CR> " , desc = " Choose all theirs" }
41+ maps .n .ca = { " <Plug>(AvanteConflictAllTheirs) " , desc = " Choose all theirs" , expr = true }
42+ maps .v .ca = { " <Plug>(AvanteConflictAllTheirs) " , desc = " Choose all theirs" , expr = true }
5043
51- maps .n .c0 = { " :AvanteConflictChooseNone<CR> " , desc = " Choose none " }
52- maps .v .c0 = { " :AvanteConflictChooseNone<CR> " , desc = " Choose none " }
44+ maps .n .cb = { " <Plug>(AvanteConflictBoth) " , desc = " Choose both " , expr = true }
45+ maps .v .cb = { " <Plug>(AvanteConflictBoth) " , desc = " Choose both " , expr = true }
5346
54- maps .n .cb = { " :AvanteConflictChooseBoth<CR> " , desc = " Choose both " }
55- maps .v .cb = { " :AvanteConflictChooseBoth<CR> " , desc = " Choose both " }
47+ maps .n .cc = { " <Plug>(AvanteConflictCursor) " , desc = " Choose cursor " , expr = true }
48+ maps .v .cc = { " <Plug>(AvanteConflictCursor) " , desc = " Choose cursor " , expr = true }
5649
57- maps .n .cc = { " :AvanteConflictChooseCursor<CR>" , desc = " Choose cursor" }
58- maps .v .cc = { " :AvanteConflictChooseCursor<CR>" , desc = " Choose cursor" }
50+ maps .n [" ]x" ] = { " <Plug>(AvanteConflictPrevConflict)" , desc = " Move to previous conflict" , expr = true }
5951
60- maps .n [" ]x" ] = { " :AvanteConflictPrevConflict<CR>" , desc = " Move to previous conflict" }
61- maps .v [" ]x" ] = { " :AvanteConflictPrevConflict<CR>" , desc = " Move to previous conflict" }
62-
63- maps .n [" [x" ] = { " :AvanteConflictNextConflict<CR>" , desc = " Move to next conflict" }
64- maps .x [" [x" ] = { " :AvanteConflictNextConflict<CR>" , desc = " Move to next conflict" }
52+ maps .n [" [x" ] = { " <Plug>(AvanteConflictNextConflict)" , desc = " Move to next conflict" , expr = true }
6553 end ,
6654 },
6755 },
0 commit comments