feat(snippets): support priority

also cleanup postfix snippets on 'math_iA'

Author: iurimateus

lua/luasnip-latex-snippets/init.lua

@@ -28,7 +28,7 @@ M.init = function()
   for _, snip in ipairs(require("luasnip-latex-snippets/math_i")) do
     snip.condition = pipe({ is_math })
     snip.wordTrig = false
-    ls.add_snippets("tex", { snip })
+    ls.add_snippets("tex", { snip }, { default_priority = 0 })
   end
 
   local autosnippets = {}
@@ -78,7 +78,10 @@ M.init = function()
     table.insert(autosnippets, snip)
   end
 
-  ls.add_snippets("tex", autosnippets, { type = "autosnippets" })
+  ls.add_snippets("tex", autosnippets, {
+    type = "autosnippets",
+    default_priority = 0,
+  })
 
   -- "Basic template": {
   --     "body": [

lua/luasnip-latex-snippets/math_iA.lua

@@ -1,6 +1,7 @@
 local ls = require("luasnip")
 local s = ls.snippet
 local f = ls.function_node
+local with_priority = require("luasnip-latex-snippets.util.utils").with_priority
 
 local math_iA = {
   s(
@@ -9,6 +10,7 @@ local math_iA = {
       wordTrig = false,
       regTrig = true,
       name = "bar",
+      priority = 100,
     },
     f(function(_, snip)
       return string.format("\\overline{%s}", snip.captures[1])
@@ -20,12 +22,16 @@ local math_iA = {
       wordTrig = false,
       regTrig = true,
       name = "hat",
+      priority = 100,
     },
     f(function(_, snip)
       return string.format("\\hat{%s}", snip.captures[1])
     end, {})
   ),
 
+  with_priority(ls.parser.parse_snippet({ trig = "hat", name = "hat" }, "\\hat{$1}$0 "), 10),
+  with_priority(ls.parser.parse_snippet({ trig = "bar", name = "bar" }, "\\overline{$1}$0 "), 10),
+
   ls.parser.parse_snippet({ trig = "td", name = "to the ... power ^{}" }, "^{$1}$0 "),
   ls.parser.parse_snippet({ trig = "rd", name = "to the ... power ^{()}" }, "^{($1)}$0 "),
   ls.parser.parse_snippet({ trig = "cb", name = "Cube ^3" }, "^3 "),
@@ -44,13 +50,18 @@ local math_iA = {
   ls.parser.parse_snippet({ trig = "R0+", name = "R0+" }, "\\R_0^+"),
 
   ls.parser.parse_snippet({ trig = "notin", name = "not in " }, "\\not\\in "),
+
   ls.parser.parse_snippet({ trig = "cc", name = "subset" }, "\\subset "),
+
   ls.parser.parse_snippet(
     { trig = "sq", name = "\\sqrt{}" },
     "\\sqrt{${1:${TM_SELECTED_TEXT}}} $0"
   ),
-  ls.parser.parse_snippet({ trig = "<->", name = "leftrightarrow" }, "\\leftrightarrow"),
-  ls.parser.parse_snippet({ trig = "...", name = "ldots" }, "\\ldots"),
+  with_priority(
+    ls.parser.parse_snippet({ trig = "<->", name = "leftrightarrow" }, "\\leftrightarrow"),
+    200
+  ),
+  with_priority(ls.parser.parse_snippet({ trig = "...", name = "ldots" }, "\\ldots "), 100),
   ls.parser.parse_snippet({ trig = "!>", name = "mapsto" }, "\\mapsto "),
   ls.parser.parse_snippet({ trig = "iff", name = "iff" }, "\\iff"),
   ls.parser.parse_snippet({ trig = "ooo", name = "\\infty" }, "\\infty"),
@@ -67,7 +78,8 @@ local math_iA = {
   ls.parser.parse_snippet({ trig = "mcal", name = "mathcal" }, "\\mathcal{$1}$0"),
   ls.parser.parse_snippet({ trig = "//", name = "Fraction" }, "\\frac{$1}{$2}$0"),
   ls.parser.parse_snippet({ trig = "\\\\\\", name = "setminus" }, "\\setminus"),
-  ls.parser.parse_snippet({ trig = "->", name = "to" }, "\\to "),
+  with_priority(ls.parser.parse_snippet({ trig = "->", name = "to" }, "\\to "), 100),
+
   ls.parser.parse_snippet(
     { trig = "letw", name = "let omega" },
     "Let $\\Omega \\subset \\C$ be open."
@@ -82,14 +94,15 @@ local math_iA = {
   ls.parser.parse_snippet({ trig = "stt", name = "text subscript" }, "_\\text{$1} $0"),
 
   ls.parser.parse_snippet({ trig = "xx", name = "cross" }, "\\times "),
-  ls.parser.parse_snippet({ trig = "**", name = "cdot" }, "\\cdot "),
+
+  with_priority(ls.parser.parse_snippet({ trig = "**", name = "cdot" }, "\\cdot "), 100),
+
   ls.parser.parse_snippet({ trig = "SI", name = "SI" }, "\\SI{$1}{$2}"),
   ls.parser.parse_snippet({ trig = "inn", name = "in " }, "\\in "),
   ls.parser.parse_snippet(
     { trig = "cvec", name = "column vector" },
     "\\begin{pmatrix} ${1:x}_${2:1}\\\\ \\vdots\\\\ $1_${2:n} \\end{pmatrix}"
   ),
-  ls.parser.parse_snippet({ trig = "bar", name = "bar" }, "\\overline{$1}$0"),
   ls.parser.parse_snippet({ trig = "ceil", name = "ceil" }, "\\left\\lceil $1 \\right\\rceil $0"),
   ls.parser.parse_snippet({ trig = "OO", name = "emptyset" }, "\\O"),
   ls.parser.parse_snippet({ trig = "RR", name = "real" }, "\\R"),
@@ -107,42 +120,28 @@ local math_iA = {
   ls.parser.parse_snippet({ trig = "DD", name = "D" }, "\\mathbb{D}"),
   ls.parser.parse_snippet({ trig = "HH", name = "H" }, "\\mathbb{H}"),
   ls.parser.parse_snippet({ trig = "lll", name = "l" }, "\\ell"),
-  ls.parser.parse_snippet(
-    { trig = "dint", name = "integral" },
-    "\\int_{${1:-\\infty}}^{${2:\\infty}} ${3:${TM_SELECTED_TEXT}} $0"
+  with_priority(
+    ls.parser.parse_snippet(
+      { trig = "dint", name = "integral" },
+      "\\int_{${1:-\\infty}}^{${2:\\infty}} ${3:${TM_SELECTED_TEXT}} $0"
+    ),
+    300
   ),
+
   ls.parser.parse_snippet({ trig = "==", name = "equals" }, "&= $1 \\\\"),
   ls.parser.parse_snippet({ trig = "!=", name = "equals" }, "\\neq "),
   ls.parser.parse_snippet({ trig = "compl", name = "complement" }, "^{c}"),
   ls.parser.parse_snippet({ trig = "__", name = "subscript" }, "_{$1}$0"),
   ls.parser.parse_snippet({ trig = "=>", name = "implies" }, "\\implies"),
   ls.parser.parse_snippet({ trig = "=<", name = "implied by" }, "\\impliedby"),
   ls.parser.parse_snippet({ trig = "<<", name = "<<" }, "\\ll"),
-  ls.parser.parse_snippet({ trig = "hat", name = "hat" }, "\\hat{$1}$0"),
+
   ls.parser.parse_snippet({ trig = "<=", name = "leq" }, "\\le "),
   ls.parser.parse_snippet({ trig = ">=", name = "geq" }, "\\ge "),
   ls.parser.parse_snippet({ trig = "invs", name = "inverse" }, "^{-1}"),
   ls.parser.parse_snippet({ trig = "~~", name = "~" }, "\\sim "),
   -- ls.parser.parse_snippet({ trig = "lrb", name = "left\\{ right\\}" }, "\\left\\{ ${1:${TM_SELECTED_TEXT}} \\right\\} $0"),
   ls.parser.parse_snippet({ trig = "conj", name = "conjugate" }, "\\overline{$1}$0"),
-
-  ls.parser.parse_snippet({ trig = "asin", name = "arcsin" }, "\\arcsin "),
-  ls.parser.parse_snippet({ trig = "acos", name = "arccos" }, "\\arccos "),
-  ls.parser.parse_snippet({ trig = "atan", name = "arctan" }, "\\arctan "),
-  ls.parser.parse_snippet({ trig = "asec", name = "arcsec" }, "\\arcsec "),
-  ls.parser.parse_snippet({ trig = "acsc", name = "arccsc" }, "\\arccsc "),
-  -- Postfix
-  --
-  ls.parser.parse_snippet({ trig = "ln", name = "ln postfix" }, "\\ln "),
-  ls.parser.parse_snippet({ trig = "log", name = "log postfix" }, "\\log "),
-  ls.parser.parse_snippet({ trig = "exp", name = "exp postfix" }, "\\exp "),
-  ls.parser.parse_snippet({ trig = "star", name = "star postfix" }, "\\star "),
-  ls.parser.parse_snippet({ trig = "perp", name = "perp postfix" }, "\\perp "),
-  ls.parser.parse_snippet({ trig = "pm", name = "pm postfix" }, "\\pm "),
-  ls.parser.parse_snippet({ trig = "int", name = "int postfix" }, "\\int "),
-
-  ls.parser.parse_snippet({ trig = "qquad", name = "maths whitespace qquad" }, "\\qquad "),
-  ls.parser.parse_snippet({ trig = "quad", name = "maths whitespace qquad" }, "\\qquad "),
 }
 
 return math_iA

lua/luasnip-latex-snippets/math_rA_no_backslash.lua

@@ -2,28 +2,47 @@ local ls = require("luasnip")
 local s = ls.snippet
 local f = ls.function_node
 
-local math_rA_no_backslash = {}
+local postfix_trig = function(match)
+  return string.format("(%s)", match)
+end
 
--- "([aA]lpha|[bB]eta|[gG]amma|[dD]elta|[eE]psilon|[zZ]eta|[tT]heta|[iI]ota|[kK]appa|[lL]ambda|[mM]u|[nN]u|[pP]i|[rR]ho|sigma|[tT]au|[pP]hi|[cC]hi|[pP]si|[oO]mega)"
-local greek_postfix_completions = function()
-  local greek_node = {
-    f(function(_, snip)
-      return string.format("\\%s ", snip.captures[1])
-    end, {}),
-  }
-
-  local build_snippet = function(match)
-    return s({
-      trig = string.format("(%s)", match),
-    }, vim.deepcopy(greek_node))
+local postfix_node = f(function(_, snip)
+  return string.format("\\%s ", snip.captures[1])
+end, {})
+
+local build_snippet = function(trig, node, match, priority, name)
+  return s({
+    name = name and name(match),
+    trig = trig(match),
+    priority = priority,
+  }, vim.deepcopy(node))
+end
+
+local build_with_priority = function(trig, node, priority, name)
+  return function(match)
+    return build_snippet(trig, node, match, priority, name)
   end
+end
 
+local greek_postfix_completions = function()
   local re =
     "[aA]lpha|[bB]eta|[gG]amma|[dD]elta|[eE]psilon|[zZ]eta|[tT]heta|[iI]ota|[kK]appa|[lL]ambda|[mM]u|[nN]u|[pP]i|[rR]ho|sigma|[tT]au|[pP]hi|[cC]hi|[pP]si|[oO]mega"
 
-  return vim.tbl_map(build_snippet, vim.split(re, "|"))
+  local build = build_with_priority(postfix_trig, postfix_node, 200)
+  return vim.tbl_map(build, vim.split(re, "|"))
+end
+
+local postfix_completions = function()
+  local re = "sin|cos|tan|csc|sec|cot|ln|log|exp|star|perp|pm|int"
+
+  local build = build_with_priority(postfix_trig, postfix_node, 100)
+  return vim.tbl_map(build, vim.split(re, "|"))
 end
 
+local math_rA_no_backslash = {}
+
 vim.list_extend(math_rA_no_backslash, greek_postfix_completions())
+vim.list_extend(math_rA_no_backslash, postfix_completions())
+vim.list_extend(math_rA_no_backslash, { build_snippet(postfix_trig, postfix_node, "q?quad", 200) })
 
 return math_rA_no_backslash

lua/luasnip-latex-snippets/util/utils.lua

@@ -47,4 +47,9 @@ M.env = function(name)
   return x ~= "0" and y ~= "0"
 end
 
+M.with_priority = function(snip, priority)
+  snip.priority = priority
+  return snip
+end
+
 return M