Skip to content

Commit a68448f

Browse files
alexr00alexr00
authored
Update grammars (microsoft#181143)
1 parent 1c59c16 commit a68448f

File tree

13 files changed

+624
-517
lines changed

13 files changed

+624
-517
lines changed

‎extensions/css/cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "microsoft/vscode-css",
88
"repositoryUrl": "https://github.com/microsoft/vscode-css",
9-
"commitHash": "4a6dc90f332bfa72c88192513435a64013d9aad4"
9+
"commitHash": "1452547185a1793c946cf67f8c7c9001716e32c3"
1010
}
1111
},
1212
"licenseDetail": [
@@ -46,7 +46,7 @@
4646
],
4747
"license": "MIT License",
4848
"description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
49-
"version": "0.45.1"
49+
"version": "0.0.0"
5050
}
5151
],
5252
"version": 1

‎extensions/css/syntaxes/css.tmLanguage.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/microsoft/vscode-css/commit/4a6dc90f332bfa72c88192513435a64013d9aad4",
7+
"version": "https://github.com/microsoft/vscode-css/commit/1452547185a1793c946cf67f8c7c9001716e32c3",
88
"name": "CSS",
99
"scopeName": "source.css",
1010
"patterns": [
@@ -1198,7 +1198,7 @@
11981198
]
11991199
},
12001200
{
1201-
"begin": "(?i)((:)(?:not|has|matches))(\\()",
1201+
"begin": "(?i)((:)(?:not|has|matches|where|is))(\\()",
12021202
"beginCaptures": {
12031203
"1": {
12041204
"name": "entity.other.attribute-name.pseudo-class.css"

‎extensions/latex/cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "jlelong/vscode-latex-basics",
88
"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
9-
"commitHash": "d80a1a5dcff9b85217e174242dd3d0e2210b94a0"
9+
"commitHash": "580c019674f82ef887a6dcce7bfc75ab0b58486d"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "1.5.1",
13+
"version": "1.5.2",
1414
"description": "The files in syntaxes/ were originally part of https://github.com/James-Yu/LaTeX-Workshop. They have been extracted in the hope that they can useful outside of the LaTeX-Workshop extension.",
1515
"licenseDetail": [
1616
"Copyright (c) vscode-latex-basics authors",

‎extensions/latex/syntaxes/Bibtex.tmLanguage.json

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/jlelong/vscode-latex-basics/commit/d80a1a5dcff9b85217e174242dd3d0e2210b94a0",
7+
"version": "https://github.com/jlelong/vscode-latex-basics/commit/4b19be579cb4a3c680f8b4bb613dcebfac826f8b",
88
"name": "BibTeX",
99
"scopeName": "text.bibtex",
1010
"comment": "Grammar based on description from http://artis.imag.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html#comment\n\t\n\tTODO: Does not support @preamble\n\t",
@@ -27,7 +27,7 @@
2727
]
2828
},
2929
{
30-
"begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z]*)",
30+
"begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)",
3131
"beginCaptures": {
3232
"1": {
3333
"name": "keyword.other.string-constant.bibtex"
@@ -56,7 +56,7 @@
5656
]
5757
},
5858
{
59-
"begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z]*)",
59+
"begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)",
6060
"beginCaptures": {
6161
"1": {
6262
"name": "keyword.other.string-constant.bibtex"
@@ -131,13 +131,13 @@
131131
"include": "#percentage_comment"
132132
},
133133
{
134-
"include": "#string_var"
134+
"include": "#integer"
135135
},
136136
{
137137
"include": "#string_content"
138138
},
139139
{
140-
"include": "#integer"
140+
"include": "#string_var"
141141
}
142142
]
143143
}
@@ -190,13 +190,13 @@
190190
"include": "#percentage_comment"
191191
},
192192
{
193-
"include": "#string_var"
193+
"include": "#integer"
194194
},
195195
{
196196
"include": "#string_content"
197197
},
198198
{
199-
"include": "#integer"
199+
"include": "#string_var"
200200
}
201201
]
202202
}
@@ -210,8 +210,12 @@
210210
],
211211
"repository": {
212212
"integer": {
213-
"match": "\\d+",
214-
"name": "constant.numeric.bibtex"
213+
"match": "\\s*(\\d+)\\s*",
214+
"captures": {
215+
"1": {
216+
"name": "constant.numeric.bibtex"
217+
}
218+
}
215219
},
216220
"nested_braces": {
217221
"begin": "(?<!\\\\)\\{",
@@ -233,7 +237,7 @@
233237
]
234238
},
235239
"string_var": {
236-
"match": "(#)?\\s*([a-zA-Z]+)\\s*(#)?",
240+
"match": "(#)?\\s*([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)\\s*(#)?",
237241
"captures": {
238242
"1": {
239243
"name": "keyword.operator.bibtex"

‎extensions/latex/syntaxes/LaTeX.tmLanguage.json

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/jlelong/vscode-latex-basics/commit/eed5b817b757aab3695af437409fcbfdd37bbc59",
7+
"version": "https://github.com/jlelong/vscode-latex-basics/commit/580c019674f82ef887a6dcce7bfc75ab0b58486d",
88
"name": "LaTeX",
99
"scopeName": "text.tex.latex",
1010
"patterns": [
@@ -1205,16 +1205,32 @@
12051205
"name": "punctuation.definition.function.latex"
12061206
},
12071207
"3": {
1208-
"name": "punctuation.definition.arguments.begin.latex"
1208+
"patterns": [
1209+
{
1210+
"include": "#optional-arg"
1211+
}
1212+
]
12091213
},
12101214
"4": {
1211-
"name": "markup.underline.link.latex"
1215+
"name": "punctuation.definition.arguments.begin.latex"
12121216
},
12131217
"5": {
1218+
"name": "markup.underline.link.latex"
1219+
},
1220+
"6": {
1221+
"name": "punctuation.definition.arguments.end.latex"
1222+
},
1223+
"7": {
1224+
"name": "punctuation.definition.arguments.begin.latex"
1225+
},
1226+
"8": {
1227+
"name": "entity.name.hyperlink.latex"
1228+
},
1229+
"9": {
12141230
"name": "punctuation.definition.arguments.end.latex"
12151231
}
12161232
},
1217-
"match": "(?:\\s*)((\\\\)(?:url|href))(\\{)([^}]*)(\\})",
1233+
"match": "(?:\\s*)((\\\\)(?:url|href|hyperref|hyperimage))(\\[[^\\[]*?\\])?(\\{)([^}]*)(\\})(?:\\{[^}]*\\}){2}?(?:(\\{)([^}]*)(\\}))?",
12181234
"name": "meta.function.link.url.latex"
12191235
},
12201236
{
@@ -1737,7 +1753,7 @@
17371753
"match": "((%).*)$"
17381754
},
17391755
{
1740-
"match": "[\\p{Alphabetic}:.-]+",
1756+
"match": "[\\p{Alphabetic}\\p{Number}:.-]+",
17411757
"name": "constant.other.reference.citation.latex"
17421758
}
17431759
]
@@ -1764,7 +1780,7 @@
17641780
"name": "meta.citation.latex",
17651781
"patterns": [
17661782
{
1767-
"match": "[\\p{Alphabetic}:.]+",
1783+
"match": "[\\p{Alphabetic}\\p{Number}:.]+",
17681784
"name": "constant.other.reference.citation.latex"
17691785
}
17701786
]
@@ -2054,6 +2070,30 @@
20542070
}
20552071
]
20562072
},
2073+
{
2074+
"name": "string.quoted.double.latex",
2075+
"match": "(?<!\\\\)(\\`\\`)(?:.*?(?<!\\\\))(\\'\\'|\\\")",
2076+
"captures": {
2077+
"1": {
2078+
"name": "punctuation.definition.string.begin.latex"
2079+
},
2080+
"2": {
2081+
"name": "punctuation.definition.string.end.latex"
2082+
}
2083+
}
2084+
},
2085+
{
2086+
"name": "string.quoted.single.latex",
2087+
"match": "(?<!\\\\)(\\`)(?:.*?(?<!\\\\))(\\')",
2088+
"captures": {
2089+
"1": {
2090+
"name": "punctuation.definition.string.begin.latex"
2091+
},
2092+
"2": {
2093+
"name": "punctuation.definition.string.end.latex"
2094+
}
2095+
}
2096+
},
20572097
{
20582098
"begin": "\\$\\$",
20592099
"beginCaptures": {
@@ -2250,7 +2290,7 @@
22502290
]
22512291
}
22522292
},
2253-
"match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}:.]+)(\\})(.*)"
2293+
"match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}\\p{Number}:.]+)(\\})(.*)"
22542294
}
22552295
]
22562296
},

‎extensions/latex/syntaxes/TeX.tmLanguage.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/jlelong/vscode-latex-basics/commit/890b6155b82b12c67b350aa99be5637eaa64f222",
7+
"version": "https://github.com/jlelong/vscode-latex-basics/commit/2be145a0bde15dfaf367676a1227c8a701792f90",
88
"name": "TeX",
99
"scopeName": "text.tex",
1010
"patterns": [
@@ -117,7 +117,7 @@
117117
"name": "punctuation.definition.function.tex"
118118
}
119119
},
120-
"match": "(\\\\)(?:[A-Za-z@]+|[,;])",
120+
"match": "(\\\\)(?:[\\p{Alphabetic}@]+|[,;])",
121121
"name": "support.function.general.tex"
122122
},
123123
{

0 commit comments

Comments
 (0)