modules/programs/nvim/plugins/lua/nvim-cmp.lua

@@ -10,9 +10,6 @@ cmp.setup({
       ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
     }),
   },
-  enabled = function()
-    return not luasnip.jumpable(1)
-  end,
   snippet = {
     -- REQUIRED - you must specify a snippet engine
     expand = function(args)
@@ -26,19 +23,19 @@ cmp.setup({
     ["<S-CR>"] = cmp.mapping.abort(),
     ["<CR>"] = cmp.mapping.confirm({ select = true }),
     ["<Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
+      if luasnip.jumpable(1) then
-        cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
-      elseif luasnip.jumpable(1) then
         luasnip.jump(1)
+      elseif cmp.visible() then
+        cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
       else
         fallback()
       end
     end, { "i", "s" }),
     ["<S-Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
+      if luasnip.jumpable(-1) then
-        cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select })
-      elseif luasnip.jumpable(-1) then
         luasnip.jump(-1)
+      elseif cmp.visible() then
+        cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select })
       else
         fallback()
       end
@@ -46,6 +43,8 @@ cmp.setup({
     ["<C-n>"] = cmp.mapping(function(fallback)
       if luasnip.choice_active() then
         luasnip.change_choice(1)
+      elseif cmp.visible() then
+        cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
       else
         fallback()
       end
@@ -53,6 +52,8 @@ cmp.setup({
     ["<C-p>"] = cmp.mapping(function(fallback)
       if luasnip.choice_active() then
         luasnip.change_choice(-1)
+      elseif cmp.visible() then
+        cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select })
       else
         fallback()
       end

modules/programs/nvim/plugins/snippets/python.lua

@@ -183,51 +183,6 @@ local dot_try = postfix(".try", {
   end),
 })
 
-local parr = s(
-  "parr",
-  fmt(
-    [[
-    :param {name}: {description}
-    :type {name}: {type}
-    ]],
-    {
-      name = i(1, "name"),
-      description = i(2, "description"),
-      type = i(3, "type"),
-    },
-    {
-      repeat_duplicates = true,
-    }
-  )
-)
-
-local retr = s(
-  "retr",
-  fmt(
-    [[
-    :return: {description}
-    :rtype: {rtype}
-    ]],
-    {
-      description = i(1, "description"),
-      rtype = i(2, "rtype"),
-    }
-  )
-)
-
-local raisr = s(
-  "raisr",
-  fmt(
-    [[
-    :raises {exception}: {description}
-    ]],
-    {
-      exception = i(1, "Exception"),
-      description = i(2, "description"),
-    }
-  )
-)
-
 return {
   def,
   defs,
@@ -236,7 +191,4 @@ return {
   dot_items,
   dot_try,
   enum,
-  parr,
-  retr,
-  raisr,
 }