Command and env snippets should not have %

This commit is contained in:
James Yu 2022-12-16 21:24:40 +08:00
parent f44c23e1e3
commit 16208f5765
8 changed files with 187 additions and 184 deletions

View File

@ -12,7 +12,7 @@
"cmds": {
"setchemformula{}": {
"command": "setchemformula{}",
"snippet": "setchemformula{${1:%<options%>}}",
"snippet": "setchemformula{${1:options}}",
"option": "",
"keyvals": [
"decimal-marker={",
@ -89,7 +89,7 @@
},
"ch[]{}": {
"command": "ch[]{}",
"snippet": "ch[${2:%<options%>}]{${1:formula}}",
"snippet": "ch[${2:options}]{${1:formula}}",
"option": "",
"keyvals": [
"decimal-marker={",
@ -217,7 +217,7 @@
},
"chcpd[]{}": {
"command": "chcpd[]{}",
"snippet": "chcpd[${2:%<options%>}]{${1:compound}}",
"snippet": "chcpd[${2:options}]{${1:compound}}",
"option": "",
"keyvals": [
"plus-space={",
@ -404,7 +404,7 @@
},
"chlewis[]{}{}": {
"command": "chlewis[]{}{}",
"snippet": "chlewis[${3:%<options%>}]{${1:electron spec}}{${2:atom}}",
"snippet": "chlewis[${3:options}]{${1:electron spec}}{${2:atom}}",
"option": "",
"keyvals": [
"lewis-default=",

View File

@ -1774,7 +1774,7 @@
},
"chapterstyle{}": {
"command": "chapterstyle{}",
"snippet": "chapterstyle{${1:style%keyvals}}",
"snippet": "chapterstyle{${1:style}}",
"option": "",
"keyvals": [],
"keyvalindex": -1
@ -1788,7 +1788,7 @@
},
"checkandfixthelayout[]": {
"command": "checkandfixthelayout[]",
"snippet": "checkandfixthelayout[${1:algoritm%keyvals}]",
"snippet": "checkandfixthelayout[${1:algoritm}]",
"option": "",
"keyvals": [],
"keyvalindex": -1
@ -1809,7 +1809,7 @@
},
"checkthelayout[]": {
"command": "checkthelayout[]",
"snippet": "checkthelayout[${1:algoritm%keyvals}]",
"snippet": "checkthelayout[${1:algoritm}]",
"option": "",
"keyvals": [],
"keyvalindex": -1
@ -3458,7 +3458,7 @@
},
"maxsecnumdepth{}": {
"command": "maxsecnumdepth{}",
"snippet": "maxsecnumdepth{${1:secname%keyvals}}",
"snippet": "maxsecnumdepth{${1:secname}}",
"option": "",
"keyvals": [],
"keyvalindex": -1
@ -6631,7 +6631,7 @@
},
"setsecnumdepth{}": {
"command": "setsecnumdepth{}",
"snippet": "setsecnumdepth{${1:secname%keyvals}}",
"snippet": "setsecnumdepth{${1:secname}}",
"option": "",
"keyvals": [],
"keyvalindex": -1

View File

@ -124,7 +124,7 @@
},
"mint[]{}": {
"command": "mint[]{}",
"snippet": "mint[${2:%<options%>}]{${1:%<language%>}}|${3:code}|",
"snippet": "mint[${2:options}]{${1:%<language%>}}|${3:code}|",
"option": "",
"keyvals": [
"autogobble",
@ -323,7 +323,7 @@
},
"mintinline[]{}": {
"command": "mintinline[]{}",
"snippet": "mintinline[${2:%<options%>}]{${1:%<language%>}}|${3:code}|",
"snippet": "mintinline[${2:options}]{${1:%<language%>}}|${3:code}|",
"option": "",
"keyvals": [
"autogobble",
@ -426,7 +426,7 @@
},
"inputminted[]{}{}": {
"command": "inputminted[]{}{}",
"snippet": "inputminted[${3:options%keyvals}]{${1:language}}{${2:file}}",
"snippet": "inputminted[${3:options}]{${1:language}}{${2:file}}",
"option": "",
"keyvals": [
"autogobble",
@ -536,7 +536,7 @@
},
"setminted{}": {
"command": "setminted{}",
"snippet": "setminted{${1:options%keyvals}}",
"snippet": "setminted{${1:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -632,7 +632,7 @@
},
"setminted[]{}": {
"command": "setminted[]{}",
"snippet": "setminted[${2:language}]{${1:options%keyvals}}",
"snippet": "setminted[${2:language}]{${1:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -728,7 +728,7 @@
},
"setmintedinline{}": {
"command": "setmintedinline{}",
"snippet": "setmintedinline{${1:options%keyvals}}",
"snippet": "setmintedinline{${1:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -824,7 +824,7 @@
},
"setmintedinline[]{}": {
"command": "setmintedinline[]{}",
"snippet": "setmintedinline[${2:language}]{${1:options%keyvals}}",
"snippet": "setmintedinline[${2:language}]{${1:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -941,7 +941,7 @@
},
"newminted{}{}": {
"command": "newminted{}{}",
"snippet": "newminted{${1:language}}{${2:options%keyvals}}",
"snippet": "newminted{${1:language}}{${2:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -1037,7 +1037,7 @@
},
"newminted[]{}{}": {
"command": "newminted[]{}{}",
"snippet": "newminted[${3:envname}]{${1:language}}{${2:options%keyvals}}",
"snippet": "newminted[${3:envname}]{${1:language}}{${2:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -1133,7 +1133,7 @@
},
"newmint{}{}": {
"command": "newmint{}{}",
"snippet": "newmint{${1:language}}{${2:options%keyvals}}",
"snippet": "newmint{${1:language}}{${2:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -1229,7 +1229,7 @@
},
"newmint[]{}{}": {
"command": "newmint[]{}{}",
"snippet": "newmint[${3:macro name}]{${1:language}}{${2:options%keyvals}}",
"snippet": "newmint[${3:macro name}]{${1:language}}{${2:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -1325,7 +1325,7 @@
},
"newmintinline{}{}": {
"command": "newmintinline{}{}",
"snippet": "newmintinline{${1:language}}{${2:options%keyvals}}",
"snippet": "newmintinline{${1:language}}{${2:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -1421,7 +1421,7 @@
},
"newmintinline[]{}{}": {
"command": "newmintinline[]{}{}",
"snippet": "newmintinline[${3:macro name}]{${1:language}}{${2:options%keyvals}}",
"snippet": "newmintinline[${3:macro name}]{${1:language}}{${2:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -1517,7 +1517,7 @@
},
"newmintedfile{}{}": {
"command": "newmintedfile{}{}",
"snippet": "newmintedfile{${1:language}}{${2:options%keyvals}}",
"snippet": "newmintedfile{${1:language}}{${2:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -1613,7 +1613,7 @@
},
"newmintedfile[]{}{}": {
"command": "newmintedfile[]{}{}",
"snippet": "newmintedfile[${3:macro name}]{${1:language}}{${2:options%keyvals}}",
"snippet": "newmintedfile[${3:macro name}]{${1:language}}{${2:options}}",
"option": "",
"keyvals": [
"autogobble",
@ -1838,7 +1838,7 @@
"minted[]": {
"name": "minted",
"detail": "minted[options%keyvals]",
"snippet": "[${1:options%keyvals}]",
"snippet": "[${1:options}]",
"option": "",
"keyvals": [
"autogobble",
@ -1943,7 +1943,7 @@
"minted[]{}": {
"name": "minted",
"detail": "minted[options%keyvals]{language}",
"snippet": "[${2:options%keyvals}]{${1:language}}",
"snippet": "[${2:options}]{${1:language}}",
"option": "",
"keyvals": [
"autogobble",

View File

@ -26,7 +26,7 @@
},
"ang[]{}": {
"command": "ang[]{}",
"snippet": "ang[${2:%<options%>}]{${1:%<number%>}}",
"snippet": "ang[${2:options}]{${1:%<number%>}}",
"option": "",
"keyvals": [
"color=",
@ -207,7 +207,7 @@
},
"complexqty[]{}{}": {
"command": "complexqty[]{}{}",
"snippet": "complexqty[${3:%<options%>}]{${1:%<number%>}}{${2:%<unit%>}}",
"snippet": "complexqty[${3:options}]{${1:%<number%>}}{${2:%<unit%>}}",
"option": "",
"keyvals": [
"color=",
@ -389,7 +389,7 @@
},
"DeclareSIUnit[]{}{}": {
"command": "DeclareSIUnit[]{}{}",
"snippet": "DeclareSIUnit[${3:%<options%>}]{${1:%<unit%>%cmd}}{${2:%<symbol%>}}",
"snippet": "DeclareSIUnit[${3:options}]{${1:%<unit%>%cmd}}{${2:%<symbol%>}}",
"option": "",
"keyvals": [
"color=",
@ -1134,7 +1134,7 @@
},
"num[]{}": {
"command": "num[]{}",
"snippet": "num[${2:%<options%>}]{${1:%<number%>}}",
"snippet": "num[${2:options}]{${1:%<number%>}}",
"option": "",
"keyvals": [
"color=",
@ -1207,7 +1207,7 @@
},
"numlist[]{}": {
"command": "numlist[]{}",
"snippet": "numlist[${2:%<options%>}]{${1:%<numbers%>}}",
"snippet": "numlist[${2:options}]{${1:%<numbers%>}}",
"option": "",
"keyvals": [
"color=",
@ -1284,7 +1284,7 @@
},
"numproduct[]{}": {
"command": "numproduct[]{}",
"snippet": "numproduct[${2:%<options%>}]{${1:%<number%>}}",
"snippet": "numproduct[${2:options}]{${1:%<number%>}}",
"option": "",
"keyvals": [
"color=",
@ -1353,7 +1353,7 @@
},
"numrange[]{}{}": {
"command": "numrange[]{}{}",
"snippet": "numrange[${3:%<options%>}]{${1:%<number1%>}}{${2:%<number2%>}}",
"snippet": "numrange[${3:options}]{${1:%<number1%>}}{${2:%<number2%>}}",
"option": "",
"keyvals": [
"color=",
@ -1542,7 +1542,7 @@
},
"qty[]{}{}": {
"command": "qty[]{}{}",
"snippet": "qty[${3:%<options%>}]{${1:%<number%>}}{${2:%<unit%>}}",
"snippet": "qty[${3:options}]{${1:%<number%>}}{${2:%<unit%>}}",
"option": "",
"keyvals": [
"color=",
@ -1637,7 +1637,7 @@
},
"qtylist[]{}{}": {
"command": "qtylist[]{}{}",
"snippet": "qtylist[${3:%<options%>}]{${1:%<numbers%>}}{${2:%<unit%>}}",
"snippet": "qtylist[${3:options}]{${1:%<numbers%>}}{${2:%<unit%>}}",
"option": "",
"keyvals": [
"color=",
@ -1730,7 +1730,7 @@
},
"qtyrange[]{}{}{}": {
"command": "qtyrange[]{}{}{}",
"snippet": "qtyrange[${4:%<options%>}]{${1:%<number1%>}}{${2:%<number2%>}}{${3:%<unit%>}}",
"snippet": "qtyrange[${4:options}]{${1:%<number1%>}}{${2:%<number2%>}}{${3:%<unit%>}}",
"option": "",
"keyvals": [
"color=",
@ -1814,7 +1814,7 @@
},
"qtyproduct[]{}{}": {
"command": "qtyproduct[]{}{}",
"snippet": "qtyproduct[${3:%<options%>}]{${1:%<number%>}}{${2:%<unit%>}}",
"snippet": "qtyproduct[${3:options}]{${1:%<number%>}}{${2:%<unit%>}}",
"option": "",
"keyvals": [
"color=",
@ -1939,7 +1939,7 @@
},
"SI[]{}{}": {
"command": "SI[]{}{}",
"snippet": "SI[${3:%<options%>}]{${1:%<number%>}}{${2:%<unit%>}}",
"snippet": "SI[${3:options}]{${1:%<number%>}}{${2:%<unit%>}}",
"option": "",
"keyvals": [
"color=",
@ -2027,7 +2027,7 @@
},
"si[]{}": {
"command": "si[]{}",
"snippet": "si[${2:%<options%>}]{${1:%<unit%>}}",
"snippet": "si[${2:options}]{${1:%<unit%>}}",
"option": "",
"keyvals": [
"bracket-unit-denominator",
@ -2074,7 +2074,7 @@
},
"SIlist[]{}{}": {
"command": "SIlist[]{}{}",
"snippet": "SIlist[${3:%<options%>}]{${1:%<numbers%>}}{${2:%<unit%>}}",
"snippet": "SIlist[${3:options}]{${1:%<numbers%>}}{${2:%<unit%>}}",
"option": "",
"keyvals": [
"color=",
@ -2167,7 +2167,7 @@
},
"SIrange[]{}{}{}": {
"command": "SIrange[]{}{}{}",
"snippet": "SIrange[${4:%<options%>}]{${1:%<number1%>}}{${2:%<number2%>}}{${3:%<unit%>}}",
"snippet": "SIrange[${4:options}]{${1:%<number1%>}}{${2:%<number2%>}}{${3:%<unit%>}}",
"option": "",
"keyvals": [
"color=",
@ -2251,7 +2251,7 @@
},
"sisetup{}": {
"command": "sisetup{}",
"snippet": "sisetup{${1:%<options%>}}",
"snippet": "sisetup{${1:options}}",
"option": "",
"keyvals": [
"color=",
@ -2400,7 +2400,7 @@
},
"tablenum[]{}": {
"command": "tablenum[]{}",
"snippet": "tablenum[${2:%<options%>}]{${1:%<number%>}}",
"snippet": "tablenum[${2:options}]{${1:%<number%>}}",
"option": "",
"keyvals": [],
"keyvalindex": -1
@ -2491,7 +2491,7 @@
},
"unit[]{}": {
"command": "unit[]{}",
"snippet": "unit[${2:%<options%>}]{${1:%<unit%>}}",
"snippet": "unit[${2:options}]{${1:%<unit%>}}",
"option": "",
"keyvals": [
"bracket-unit-denominator",

File diff suppressed because it is too large Load Diff

View File

@ -44,7 +44,7 @@
"cmds": {
"yadsetup{}": {
"command": "yadsetup{}",
"snippet": "yadsetup{${1:%<options%>}}",
"snippet": "yadsetup{${1:options}}",
"option": "",
"keyvals": [],
"keyvalindex": -1

View File

@ -35,12 +35,12 @@ if args.infile:
def get_cwl_files() -> List[Path]:
""" Get the list of cwl files from github if not already available on disk."""
# cwl_zip = CWD.joinpath('cwl.zip')
# if not cwl_zip.exists():
# urllib.request.urlretrieve('https://github.com/jlelong/LaTeX-cwl/archive/refs/heads/master.zip', cwl_zip)
# zip_ref = zipfile.ZipFile(cwl_zip, 'r')
# zip_ref.extractall(CWD.joinpath('cwl/'))
# zip_ref.close()
cwl_zip = CWD.joinpath('cwl.zip')
if not cwl_zip.exists():
urllib.request.urlretrieve('https://github.com/jlelong/LaTeX-cwl/archive/refs/heads/master.zip', cwl_zip)
zip_ref = zipfile.ZipFile(cwl_zip, 'r')
zip_ref.extractall(CWD.joinpath('cwl/'))
zip_ref.close()
files = []
for f in CWD.joinpath('cwl/LaTeX-cwl-master').iterdir():
if f.suffix == '.cwl':

View File

@ -59,6 +59,9 @@ def create_snippet(line: str) -> str:
t = TabStop()
snippet = re.sub(r'(?<![\. ])\.\.(?![\. ])', t.sub, snippet)
snippet = re.sub(r'%keyvals', '', snippet)
snippet = re.sub(r'%<options%>', 'options', snippet)
return snippet
@ -278,7 +281,7 @@ class CwlIntel:
for pkgenv in pkg.envs:
if (pkg.envs[pkgenv].name != env):
continue
haskeyvals = re.search(r':keys|:keyvals|:options%keyvals|:%<options%>', pkg.envs[pkgenv].snippet)
haskeyvals = re.search(r':keys|:keyvals|:options', pkg.envs[pkgenv].snippet)
if (haskeyvals is None):
continue
if (pkg.envs[pkgenv].keyvalindex == -1):
@ -289,7 +292,7 @@ class CwlIntel:
for pkgcmd in pkg.cmds:
if (re.sub(r'\[\]|\(\)|<>|{}', '', pkg.cmds[pkgcmd].command) != cmd):
continue
haskeyvals = re.search(r':keys|:keyvals|:options%keyvals|:%<options%>', pkg.cmds[pkgcmd].snippet)
haskeyvals = re.search(r':keys|:keyvals|:options', pkg.cmds[pkgcmd].snippet)
if (haskeyvals is None):
continue
if (pkg.cmds[pkgcmd].keyvalindex == -1):