Skip to content

Commit 8a04d49

Browse files
iurimateusiurimateus
committed
chore: cleanup
- lim prevents typing limsup - st prevents typing 'star' - pm prevents typing pmat - pmat should not be automatically triggered - other conflicting snippets
1 parent 47b74ee commit 8a04d49

File tree

8 files changed

+44
-146
lines changed

8 files changed

+44
-146
lines changed

‎lua/luasnip-latex-snippets/init.lua‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ M.init = function()
3838
}
3939

4040
for _, snip in ipairs(require("luasnip-latex-snippets/math_wRA_no_backslash")) do
41+
snip.regTrig = true
4142
snip.condition = pipe({ is_math, no_backslash })
4243
table.insert(ls.autosnippets.tex, snip)
4344
end
4445

4546
for _, snip in ipairs(require("luasnip-latex-snippets/math_rA_no_backslash")) do
4647
snip.wordTrig = false
48+
snip.regTrig = true
4749
snip.condition = pipe({ is_math, no_backslash })
4850
table.insert(ls.autosnippets.tex, snip)
4951
end
@@ -54,17 +56,18 @@ M.init = function()
5456
end
5557

5658
for _, snip in ipairs(require("luasnip-latex-snippets/math_wrA")) do
59+
snip.regTrig = true
5760
snip.condition = pipe({ is_math })
5861
table.insert(ls.autosnippets.tex, snip)
5962
end
6063

61-
for _, snip in ipairs(require("luasnip-latex-snippets/math_iA")) do
64+
for _, snip in ipairs(require("luasnip-latex-snippets/math_wA_no_backslash")) do
6265
snip.condition = pipe({ is_math, no_backslash })
63-
snip.wordTrig = false
6466
table.insert(ls.autosnippets.tex, snip)
6567
end
6668

67-
for _, snip in ipairs(require("luasnip-latex-snippets/math_wA_no_backslash")) do
69+
for _, snip in ipairs(require("luasnip-latex-snippets/math_iA")) do
70+
snip.wordTrig = false
6871
snip.condition = pipe({ is_math, no_backslash })
6972
table.insert(ls.autosnippets.tex, snip)
7073
end

‎lua/luasnip-latex-snippets/math_i.lua‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ local math_i = {
3131
"\\frac{\\mathrm{d/${1:V}}}{\\mathrm{d${2:x}}} $0"
3232
),
3333

34+
ls.parser.parse_snippet(
35+
{ trig = "pmat", name = "pmat" },
36+
"\\begin{pmatrix} $1 \\end{pmatrix} $0"
37+
),
38+
3439
ls.parser.parse_snippet(
3540
{ trig = "lr", name = "left( right)" },
3641
"\\left( ${1:${VISUAL}} \\right) $0"

‎lua/luasnip-latex-snippets/math_iA.lua‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ local math_iA = {
7777

7878
ls.parser.parse_snippet({ trig = "tt", name = "text" }, "\\text{$1}$0"),
7979
ls.parser.parse_snippet({ trig = "stt", name = "text subscript" }, "_\\text{$1} $0"),
80-
-- ls.parser.parse_snippet({ trig = "sts", name = "text subscript" }, "_\\text{$1} $0"),
81-
82-
ls.parser.parse_snippet({ trig = "st", name = "text" }, "\\text{s.t.}"),
83-
-- ls.parser.parse_snippet({ trig = "tq", name = "text" }, "\\text{tal que}"),
8480

8581
ls.parser.parse_snippet({ trig = "xx", name = "cross" }, "\\times "),
8682
ls.parser.parse_snippet({ trig = "**", name = "cdot" }, "\\cdot "),
@@ -100,10 +96,6 @@ local math_iA = {
10096
ls.parser.parse_snippet({ trig = "NN", name = "n" }, "\\N"),
10197
ls.parser.parse_snippet({ trig = "||", name = "mid" }, " \\mid "),
10298
ls.parser.parse_snippet({ trig = "Nn", name = "cap" }, "\\cap "),
103-
ls.parser.parse_snippet(
104-
{ trig = "pmat", name = "pmat" },
105-
"\\begin{pmatrix} $1 \\end{pmatrix} $0"
106-
),
10799
ls.parser.parse_snippet(
108100
{ trig = "bmat", name = "bmat" },
109101
"\\begin{bmatrix} $1 \\end{bmatrix} $0"
@@ -118,7 +110,6 @@ local math_iA = {
118110
),
119111
ls.parser.parse_snippet({ trig = "==", name = "equals" }, "&= $1 \\\\"),
120112
ls.parser.parse_snippet({ trig = "!=", name = "equals" }, "\\neq "),
121-
ls.parser.parse_snippet({ trig = "lim", name = "limit" }, "\\lim_{${1:n} \\to ${2:\\infty}} "),
122113
ls.parser.parse_snippet({ trig = "compl", name = "complement" }, "^{c}"),
123114
ls.parser.parse_snippet({ trig = "__", name = "subscript" }, "_{$1}$0"),
124115
ls.parser.parse_snippet({ trig = "=>", name = "implies" }, "\\implies"),
@@ -132,11 +123,11 @@ local math_iA = {
132123
-- ls.parser.parse_snippet({ trig = "lrb", name = "left\\{ right\\}" }, "\\left\\{ ${1:${VISUAL}} \\right\\} $0"),
133124
ls.parser.parse_snippet({ trig = "conj", name = "conjugate" }, "\\overline{$1}$0"),
134125

135-
ls.parser.parse_snippet({ trig = "asin", name = "arcsin" }, "\\arcsin"),
136-
ls.parser.parse_snippet({ trig = "acos", name = "arccos" }, "\\arccos"),
137-
ls.parser.parse_snippet({ trig = "atan", name = "arctan" }, "\\arctan"),
138-
ls.parser.parse_snippet({ trig = "asec", name = "arcsec" }, "\\arcsec"),
139-
ls.parser.parse_snippet({ trig = "acsc", name = "arccsc" }, "\\arccsc"),
126+
ls.parser.parse_snippet({ trig = "asin", name = "arcsin" }, "\\arcsin "),
127+
ls.parser.parse_snippet({ trig = "acos", name = "arccos" }, "\\arccos "),
128+
ls.parser.parse_snippet({ trig = "atan", name = "arctan" }, "\\arctan "),
129+
ls.parser.parse_snippet({ trig = "asec", name = "arcsec" }, "\\arcsec "),
130+
ls.parser.parse_snippet({ trig = "acsc", name = "arccsc" }, "\\arccsc "),
140131
-- Postfix
141132
--
142133
ls.parser.parse_snippet({ trig = "ln", name = "ln postfix" }, "\\ln "),

‎lua/luasnip-latex-snippets/math_rA_no_backslash.lua‎

Lines changed: 19 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,29 @@
11
local ls = require("luasnip")
22
local s = ls.snippet
3-
local i = ls.insert_node
43
local f = ls.function_node
54

6-
local greek_node = {
7-
f(function(_, snip)
8-
return string.format("\\%s ", snip.captures[1])
9-
end, {}),
10-
}
5+
local math_rA_no_backslash = {}
116

12-
-- "([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)",
13-
local greek_postfix_completions = {
14-
s({
15-
trig = "([aA]lpha)",
16-
regTrig = true,
17-
}, vim.deepcopy(greek_node)),
18-
s({
19-
trig = "([bB]eta)",
20-
regTrig = true,
21-
}, vim.deepcopy(greek_node)),
22-
s({
23-
trig = "([gG]amma)",
24-
regTrig = true,
25-
}, vim.deepcopy(greek_node)),
26-
s({
27-
trig = "([dD]elta)",
28-
regTrig = true,
29-
}, vim.deepcopy(greek_node)),
30-
s({
31-
trig = "([eE]psilon)",
32-
regTrig = true,
33-
}, vim.deepcopy(greek_node)),
34-
s({
35-
trig = "([zZ]eta)",
36-
regTrig = true,
37-
}, vim.deepcopy(greek_node)),
38-
s({
39-
trig = "([tT]heta)",
40-
regTrig = true,
41-
}, vim.deepcopy(greek_node)),
42-
s({
43-
trig = "([iI]ota)",
44-
regTrig = true,
45-
}, vim.deepcopy(greek_node)),
46-
s({
47-
trig = "([kK]appa)",
48-
regTrig = true,
49-
}, vim.deepcopy(greek_node)),
50-
s({
51-
trig = "([lL]ambda)",
52-
regTrig = true,
53-
}, vim.deepcopy(greek_node)),
54-
s({
55-
trig = "([mM]u)",
56-
regTrig = true,
57-
}, vim.deepcopy(greek_node)),
58-
s({
59-
trig = "([nN]u)",
60-
regTrig = true,
61-
}, vim.deepcopy(greek_node)),
62-
s({
63-
trig = "([pP]i)",
64-
regTrig = true,
65-
}, vim.deepcopy(greek_node)),
66-
s({
67-
trig = "([rR]ho)",
68-
regTrig = true,
69-
}, vim.deepcopy(greek_node)),
70-
s({
71-
trig = "([sS]igma)",
72-
regTrig = true,
73-
}, vim.deepcopy(greek_node)),
74-
s({
75-
trig = "([tT]au)",
76-
regTrig = true,
77-
}, vim.deepcopy(greek_node)),
78-
s({
79-
trig = "([pP]hi)",
80-
regTrig = true,
81-
}, vim.deepcopy(greek_node)),
82-
s({
83-
trig = "([cC]hi)",
84-
regTrig = true,
85-
}, vim.deepcopy(greek_node)),
86-
s({
87-
trig = "([pP]si)",
88-
regTrig = true,
89-
}, vim.deepcopy(greek_node)),
90-
s({
91-
trig = "([oO]mega)",
92-
regTrig = true,
93-
}, vim.deepcopy(greek_node)),
94-
}
7+
-- "([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)"
8+
local greek_postfix_completions = function()
9+
local greek_node = {
10+
f(function(_, snip)
11+
return string.format("\\%s ", snip.captures[1])
12+
end, {}),
13+
}
9514

96-
local math_rA_no_backslash = {}
15+
local build_snippet = function(match)
16+
return s({
17+
trig = string.format("(%s)", match),
18+
}, vim.deepcopy(greek_node))
19+
end
9720

98-
for _, snip in ipairs(greek_postfix_completions) do
99-
table.insert(math_rA_no_backslash, snip)
21+
local re =
22+
"[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"
23+
24+
return vim.tbl_map(build_snippet, vim.split(re, "|"))
10025
end
10126

27+
vim.list_extend(math_rA_no_backslash, greek_postfix_completions())
28+
10229
return math_rA_no_backslash

‎lua/luasnip-latex-snippets/math_wA_no_backslash.lua‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
local ls = require("luasnip")
22

33
local math_wA_no_backslash = {
4-
ls.parser.parse_snippet({ trig = "arcsin", name = "arcsin" }, "\\arcsin"),
5-
ls.parser.parse_snippet({ trig = "arccos", name = "arccos" }, "\\arccos"),
6-
ls.parser.parse_snippet({ trig = "arctan", name = "arctan" }, "\\arctan"),
7-
ls.parser.parse_snippet({ trig = "arcsec", name = "arcsec" }, "\\arcsec"),
8-
ls.parser.parse_snippet({ trig = "arccsc", name = "arccsc" }, "\\arccsc"),
4+
ls.parser.parse_snippet({ trig = "arcsin", name = "arcsin" }, "\\arcsin "),
5+
ls.parser.parse_snippet({ trig = "arctan", name = "arctan" }, "\\arctan "),
6+
ls.parser.parse_snippet({ trig = "arcsec", name = "arcsec" }, "\\arcsec "),
97

108
ls.parser.parse_snippet({ trig = "set", name = "set" }, "\\{$1\\} $0"),
119
ls.parser.parse_snippet({ trig = "fun", name = "function map" }, "f : $1 \\R \\to \\R : $0"),

‎lua/luasnip-latex-snippets/math_wRA_no_backslash.lua‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,18 @@
11
local ls = require("luasnip")
22
local s = ls.snippet
3-
local i = ls.insert_node
43
local f = ls.function_node
54

65
local vec_node = {
76
f(function(_, snip)
87
return string.format("\\vec{%s} ", snip.captures[1])
98
end, {}),
10-
i(0),
119
}
1210

1311
local math_wrA_no_backslash = {
14-
s({
15-
trig = "([%a][%a])(%.,)",
16-
regTrig = true,
17-
name = "vector",
18-
}, vim.deepcopy(vec_node)),
19-
s({
20-
trig = "([%a][%a])(,%.)",
21-
regTrig = true,
22-
name = "vector",
23-
}, vim.deepcopy(vec_node)),
24-
s({
25-
trig = "([%a])(%.,)",
26-
regTrig = true,
27-
name = "vector",
28-
}, vim.deepcopy(vec_node)),
29-
s({
30-
trig = "([%a])(,%.)",
31-
regTrig = true,
32-
name = "vector",
33-
}, vim.deepcopy(vec_node)),
12+
s({ trig = "([%a][%a])(%.,)" }, vim.deepcopy(vec_node)),
13+
s({ trig = "([%a][%a])(,%.)" }, vim.deepcopy(vec_node)),
14+
s({ trig = "([%a])(%.,)" }, vim.deepcopy(vec_node)),
15+
s({ trig = "([%a])(,%.)" }, vim.deepcopy(vec_node)),
3416
}
3517

3618
return math_wrA_no_backslash

‎lua/luasnip-latex-snippets/math_wrA.lua‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ local frac = s({
1818
priority = 1000,
1919
trig = ".*%)/",
2020
wordTrig = true,
21-
regTrig = true,
2221
name = "() frac",
2322
}, {
2423
f(function(_, snip)
@@ -59,7 +58,6 @@ local math_wrA = {
5958

6059
s({
6160
trig = "([%a])(%d)",
62-
regTrig = true,
6361
name = "auto subscript",
6462
}, {
6563
f(function(_, snip)
@@ -70,7 +68,6 @@ local math_wrA = {
7068

7169
s({
7270
trig = "([%a])_(%d%d)",
73-
regTrig = true,
7471
name = "auto subscript 2",
7572
}, {
7673
f(function(_, snip)
@@ -81,31 +78,26 @@ local math_wrA = {
8178

8279
s({
8380
trig = "([%w]+\\?^%w)/",
84-
regTrig = true,
8581
name = "Fraction no ()",
8682
}, vim.deepcopy(frac_no_parens)),
8783

8884
s({
8985
trig = "([%w]+\\?_%w)/",
90-
regTrig = true,
9186
name = "Fraction no ()",
9287
}, vim.deepcopy(frac_no_parens)),
9388

9489
s({
9590
trig = "([%w]+\\?^{%w*})/",
96-
regTrig = true,
9791
name = "Fraction no ()",
9892
}, vim.deepcopy(frac_no_parens)),
9993

10094
s({
10195
trig = "([%w]+\\?_{%w*})/",
102-
regTrig = true,
10396
name = "Fraction no ()",
10497
}, vim.deepcopy(frac_no_parens)),
10598

10699
s({
107100
trig = "(%w+)/",
108-
regTrig = true,
109101
name = "Fraction no ()",
110102
}, vim.deepcopy(frac_no_parens)),
111103
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ M.pipe = function(fns)
2626
end
2727

2828
M.no_backslash = function()
29-
local line_to_cursor = require("luasnip.util.util").get_current_line_to_cursor
30-
return not string.match(line_to_cursor(), "\\%w+$")
29+
local line_to_cursor = require("luasnip.util.util").get_current_line_to_cursor()
30+
return not string.match(line_to_cursor, "\\%w+$")
3131
end
3232

3333
M.is_math = function()

0 commit comments

Comments
 (0)