Skip to content

Commit 96410ff

Browse files
alexr00alexr00
committed
Update grammars
1 parent 31393cc commit 96410ff

8 files changed

Lines changed: 88 additions & 11 deletions

File tree

‎extensions/css/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "octref/language-css",
88
"repositoryUrl": "https://github.com/octref/language-css",
9-
"commitHash": "6d3a2d01dd67ef062030f4520dd42a5424330a3b"
9+
"commitHash": "377734aad976be88a425aab5667784f3f71ea7e5"
1010
}
1111
},
1212
"license": "MIT",

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

Lines changed: 27 additions & 3 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/octref/language-css/commit/6d3a2d01dd67ef062030f4520dd42a5424330a3b",
7+
"version": "https://github.com/octref/language-css/commit/377734aad976be88a425aab5667784f3f71ea7e5",
88
"name": "CSS",
99
"scopeName": "source.css",
1010
"patterns": [
@@ -606,8 +606,32 @@
606606
]
607607
},
608608
{
609-
"begin": "(?i)(?=@[\\w-]+(\\s|\\(|{|;|/\\*|$))",
610-
"end": "(?<=}|;)(?!\\G)",
609+
"begin": "(?i)(?=@[\\w-]+[^;]+;s*$)",
610+
"end": "(?<=;)(?!\\G)",
611+
"patterns": [
612+
{
613+
"begin": "(?i)\\G(@)[\\w-]+",
614+
"beginCaptures": {
615+
"0": {
616+
"name": "keyword.control.at-rule.css"
617+
},
618+
"1": {
619+
"name": "punctuation.definition.keyword.css"
620+
}
621+
},
622+
"end": ";",
623+
"endCaptures": {
624+
"0": {
625+
"name": "punctuation.terminator.rule.css"
626+
}
627+
},
628+
"name": "meta.at-rule.header.css"
629+
}
630+
]
631+
},
632+
{
633+
"begin": "(?i)(?=@[\\w-]+(\\s|\\(|{|/\\*|$))",
634+
"end": "(?<=})(?!\\G)",
611635
"patterns": [
612636
{
613637
"begin": "(?i)\\G(@)[\\w-]+",

‎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": "b2100c95d7857c5421d111a860fcdd20954a0263"
9+
"commitHash": "b57388e5a0971412c081cf0cea8b50b9c24ea4e8"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/fsharp/syntaxes/fsharp.tmLanguage.json‎

Lines changed: 51 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/b2100c95d7857c5421d111a860fcdd20954a0263",
7+
"version": "https://github.com/ionide/ionide-fsgrammar/commit/b57388e5a0971412c081cf0cea8b50b9c24ea4e8",
88
"name": "fsharp",
99
"scopeName": "source.fsharp",
1010
"patterns": [
@@ -335,6 +335,44 @@
335335
}
336336
]
337337
},
338+
"anonymous_record_declaration": {
339+
"begin": "(\\{\\|)",
340+
"end": "(\\|\\})",
341+
"beginCaptures": {
342+
"1": {
343+
"name": "keyword.symbol.fsharp"
344+
}
345+
},
346+
"endCaptures": {
347+
"1": {
348+
"name": "keyword.symbol.fsharp"
349+
}
350+
},
351+
"patterns": [
352+
{
353+
"match": "[[:alpha:]0-9'`^_ ]+(:)",
354+
"captures": {
355+
"1": {
356+
"name": "keyword.symbol.fsharp"
357+
}
358+
}
359+
},
360+
{
361+
"match": "([[:alpha:]0-9'`^_ ]+)",
362+
"captures": {
363+
"1": {
364+
"name": "entity.name.type.fsharp"
365+
}
366+
}
367+
},
368+
{
369+
"include": "#anonymous_record_declaration"
370+
},
371+
{
372+
"include": "#keywords"
373+
}
374+
]
375+
},
338376
"record_signature": {
339377
"patterns": [
340378
{
@@ -819,6 +857,9 @@
819857
}
820858
]
821859
},
860+
{
861+
"include": "#anonymous_record_declaration"
862+
},
822863
{
823864
"begin": "({)",
824865
"end": "(})",
@@ -982,6 +1023,9 @@
9821023
}
9831024
}
9841025
},
1026+
{
1027+
"include": "#anonymous_record_declaration"
1028+
},
9851029
{
9861030
"include": "#keywords"
9871031
}
@@ -1062,6 +1106,9 @@
10621106
"name": "entity.name.section.fsharp"
10631107
}
10641108
}
1109+
},
1110+
{
1111+
"include": "#comments"
10651112
}
10661113
]
10671114
},
@@ -1255,6 +1302,9 @@
12551302
}
12561303
}
12571304
},
1305+
{
1306+
"include": "#anonymous_record_declaration"
1307+
},
12581308
{
12591309
"begin": "(\\?{0,1})([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`^._ ]+)(<))",
12601310
"end": "(>)",

‎extensions/make/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "fadeevab/make.tmbundle",
88
"repositoryUrl": "https://github.com/fadeevab/make.tmbundle",
9-
"commitHash": "bd71f44ea55d61be711bd7676e600a7333cc79ea"
9+
"commitHash": "1b05209b483f81f42270bdda5514590e013e4896"
1010
}
1111
},
1212
"licenseDetail": [

‎extensions/make/syntaxes/make.tmLanguage.json‎

Lines changed: 4 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/fadeevab/make.tmbundle/commit/bd71f44ea55d61be711bd7676e600a7333cc79ea",
7+
"version": "https://github.com/fadeevab/make.tmbundle/commit/1b05209b483f81f42270bdda5514590e013e4896",
88
"name": "Makefile",
99
"scopeName": "source.makefile",
1010
"patterns": [
@@ -132,6 +132,9 @@
132132
},
133133
{
134134
"include": "#comment"
135+
},
136+
{
137+
"include": "#directives"
135138
}
136139
]
137140
},

‎extensions/rust/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "language-rust",
88
"repositoryUrl": "https://github.com/zargony/atom-language-rust",
9-
"commitHash": "5238d9834953ed7c58d9b5b9bb0c084c3c11ecd6"
9+
"commitHash": "7d59e2ad79fbe5925bd2fd3bd3857bf9f421ff6f"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/rust/syntaxes/rust.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/zargony/atom-language-rust/commit/5238d9834953ed7c58d9b5b9bb0c084c3c11ecd6",
7+
"version": "https://github.com/zargony/atom-language-rust/commit/7d59e2ad79fbe5925bd2fd3bd3857bf9f421ff6f",
88
"name": "Rust",
99
"scopeName": "source.rust",
1010
"patterns": [
@@ -160,7 +160,7 @@
160160
{
161161
"comment": "Control keyword",
162162
"name": "keyword.control.rust",
163-
"match": "\\b(break|continue|else|if|in|for|loop|match|return|while)\\b"
163+
"match": "\\b(async|await|break|continue|else|if|in|for|loop|match|return|try|while)\\b"
164164
},
165165
{
166166
"comment": "Keyword",

0 commit comments

Comments
 (0)