Update grammars · glaforge/vscode@a1a4c0a · GitHub
Skip to content

Commit a1a4c0a

Browse files
committed
Update grammars
1 parent 011308e commit a1a4c0a

22 files changed

Lines changed: 275 additions & 105 deletions

extensions/clojure/cgmanifest.json

Lines changed: 2 additions & 2 deletions

extensions/clojure/syntaxes/clojure.tmLanguage.json

Lines changed: 11 additions & 15 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/atom/language-clojure/commit/de877502aa4a77ccdc2c7f0c9180436aea3effff",
7+
"version": "https://github.com/atom/language-clojure/commit/45bdb881501d0b8f8b707ca1d3fcc8b4b99fca03",
88
"name": "Clojure",
99
"scopeName": "source.clojure",
1010
"patterns": [
@@ -79,35 +79,31 @@
7979
"name": "constant.language.boolean.clojure"
8080
},
8181
{
82-
"match": "(-?\\d+/\\d+)",
82+
"match": "(##(?:Inf|-Inf|NaN))",
83+
"name": "constant.numeric.symbol.clojure"
84+
},
85+
{
86+
"match": "([-+]?\\d+/\\d+)",
8387
"name": "constant.numeric.ratio.clojure"
8488
},
8589
{
86-
"match": "(-?\\d+[rR]\\w+)",
90+
"match": "([-+]?(?:(?:3[0-6])|(?:[12]\\d)|[2-9])[rR][0-9A-Za-z]+N?)",
8791
"name": "constant.numeric.arbitrary-radix.clojure"
8892
},
8993
{
90-
"match": "(-?0[xX][0-9a-fA-F]+)",
94+
"match": "([-+]?0[xX][0-9a-fA-F]+N?)",
9195
"name": "constant.numeric.hexadecimal.clojure"
9296
},
9397
{
94-
"match": "(-?0\\d+)",
98+
"match": "([-+]?0[0-7]+N?)",
9599
"name": "constant.numeric.octal.clojure"
96100
},
97101
{
98-
"match": "(-?\\d+\\.\\d+([eE][+-]?\\d+)?M)",
99-
"name": "constant.numeric.bigdecimal.clojure"
100-
},
101-
{
102-
"match": "(-?\\d+\\.\\d+([eE][+-]?\\d+)?)",
102+
"match": "([-+]?[0-9]+(?:(\\.|(?=[eEM]))[0-9]*([eE][-+]?[0-9]+)?)M?)",
103103
"name": "constant.numeric.double.clojure"
104104
},
105105
{
106-
"match": "(-?\\d+N)",
107-
"name": "constant.numeric.bigint.clojure"
108-
},
109-
{
110-
"match": "(-?\\d+)",
106+
"match": "([-+]?\\d+N?)",
111107
"name": "constant.numeric.long.clojure"
112108
},
113109
{

extensions/cpp/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "jeff-hykin/cpp-textmate-grammar",
88
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
9-
"commitHash": "0ef79f098ed80ce5a86be4ed40f99ebcdbac4895"
9+
"commitHash": "db3f4e4a5d8335b2f6d689bec490c23f8313630f"
1010
}
1111
},
1212
"license": "MIT",

extensions/csharp/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "dotnet/csharp-tmLanguage",
88
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
9-
"commitHash": "483d25bfa2b96474b55d2e9e4d1ca2acbd542034"
9+
"commitHash": "16612717ccd557383c0c821d7b6ae6662492ffde"
1010
}
1111
},
1212
"license": "MIT",

extensions/csharp/syntaxes/csharp.tmLanguage.json

Lines changed: 5 additions & 5 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/dotnet/csharp-tmLanguage/commit/483d25bfa2b96474b55d2e9e4d1ca2acbd542034",
7+
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/16612717ccd557383c0c821d7b6ae6662492ffde",
88
"name": "C#",
99
"scopeName": "source.cs",
1010
"patterns": [
@@ -997,7 +997,7 @@
997997
"name": "keyword.other.where.cs"
998998
},
999999
"2": {
1000-
"name": "storage.type.cs"
1000+
"name": "entity.name.type.type-parameter.cs"
10011001
},
10021002
"3": {
10031003
"name": "punctuation.separator.colon.cs"
@@ -4120,7 +4120,7 @@
41204120
"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\.)",
41214121
"captures": {
41224122
"1": {
4123-
"name": "storage.type.cs"
4123+
"name": "entity.name.type.cs"
41244124
},
41254125
"2": {
41264126
"name": "punctuation.accessor.cs"
@@ -4134,12 +4134,12 @@
41344134
"name": "punctuation.accessor.cs"
41354135
},
41364136
"2": {
4137-
"name": "storage.type.cs"
4137+
"name": "entity.name.type.cs"
41384138
}
41394139
}
41404140
},
41414141
{
4142-
"name": "storage.type.cs",
4142+
"name": "entity.name.type.cs",
41434143
"match": "@?[_[:alpha:]][_[:alnum:]]*"
41444144
}
41454145
]

extensions/fsharp/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "ionide/ionide-fsgrammar",
88
"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
9-
"commitHash": "bba27391e61090035449b5c1e5c4b9d396bc4c9b"
9+
"commitHash": "3311701c243d6ed5b080a2ee16ada51540a08c50"
1010
}
1111
},
1212
"license": "MIT",

extensions/fsharp/syntaxes/fsharp.tmLanguage.json

Lines changed: 10 additions & 1 deletion
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/ionide/ionide-fsgrammar/commit/bba27391e61090035449b5c1e5c4b9d396bc4c9b",
7+
"version": "https://github.com/ionide/ionide-fsgrammar/commit/3311701c243d6ed5b080a2ee16ada51540a08c50",
88
"name": "fsharp",
99
"scopeName": "source.fsharp",
1010
"patterns": [
@@ -525,6 +525,15 @@
525525
},
526526
"comments": {
527527
"patterns": [
528+
{
529+
"name": "comment.literate.command.fsharp",
530+
"match": "(\\(\\*{3}.*\\*{3}\\))",
531+
"beginCaptures": {
532+
"1": {
533+
"name": "comment.block.fsharp"
534+
}
535+
}
536+
},
528537
{
529538
"name": "comment.block.markdown.fsharp",
530539
"begin": "^\\s*(\\(\\*\\*(?!\\)))((?!\\*\\)).)*$",

extensions/javascript/syntaxes/JavaScript.tmLanguage.json

Lines changed: 22 additions & 1 deletion
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/TypeScript-TmLanguage/commit/644389aef914fc6fbc97a4dd799cc2d1431ffc87",
7+
"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/56b7270f094b036256774702e3b7f96490981190",
88
"name": "JavaScript (with React support)",
99
"scopeName": "source.js",
1010
"patterns": [
@@ -5293,6 +5293,27 @@
52935293
}
52945294
}
52955295
},
5296+
{
5297+
"begin": "(?x)((@)template)\\s+(?={)",
5298+
"beginCaptures": {
5299+
"1": {
5300+
"name": "storage.type.class.jsdoc"
5301+
},
5302+
"2": {
5303+
"name": "punctuation.definition.block.tag.jsdoc"
5304+
}
5305+
},
5306+
"end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
5307+
"patterns": [
5308+
{
5309+
"include": "#jsdoctype"
5310+
},
5311+
{
5312+
"name": "variable.other.jsdoc",
5313+
"match": "([A-Za-z_$][\\w$.\\[\\]]*)"
5314+
}
5315+
]
5316+
},
52965317
{
52975318
"match": "(?x)\n(\n (@)\n (?:arg|argument|const|constant|member|namespace|param|var)\n)\n\\s+\n(\n [A-Za-z_$]\n [\\w$.\\[\\]]*\n)",
52985319
"captures": {

extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json

Lines changed: 22 additions & 1 deletion
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/TypeScript-TmLanguage/commit/644389aef914fc6fbc97a4dd799cc2d1431ffc87",
7+
"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/56b7270f094b036256774702e3b7f96490981190",
88
"name": "JavaScript (with React support)",
99
"scopeName": "source.js.jsx",
1010
"patterns": [
@@ -5293,6 +5293,27 @@
52935293
}
52945294
}
52955295
},
5296+
{
5297+
"begin": "(?x)((@)template)\\s+(?={)",
5298+
"beginCaptures": {
5299+
"1": {
5300+
"name": "storage.type.class.jsdoc"
5301+
},
5302+
"2": {
5303+
"name": "punctuation.definition.block.tag.jsdoc"
5304+
}
5305+
},
5306+
"end": "(?=\\s|\\*/|[^{}\\[\\]A-Za-z_$])",
5307+
"patterns": [
5308+
{
5309+
"include": "#jsdoctype"
5310+
},
5311+
{
5312+
"name": "variable.other.jsdoc",
5313+
"match": "([A-Za-z_$][\\w$.\\[\\]]*)"
5314+
}
5315+
]
5316+
},
52965317
{
52975318
"match": "(?x)\n(\n (@)\n (?:arg|argument|const|constant|member|namespace|param|var)\n)\n\\s+\n(\n [A-Za-z_$]\n [\\w$.\\[\\]]*\n)",
52985319
"captures": {

extensions/julia/cgmanifest.json

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)