Skip to content

Commit

Permalink
Update grammars
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexr00
alexr00 committed Jun 3, 2019
1 parent 31393cc commit 96410ff
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 11 deletions.
2 changes: 1 addition & 1 deletion extensions/css/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "octref/language-css",
"repositoryUrl": "https://github.com/octref/language-css",
"commitHash": "6d3a2d01dd67ef062030f4520dd42a5424330a3b"
"commitHash": "377734aad976be88a425aab5667784f3f71ea7e5"
}
},
"license": "MIT",
Expand Down
30 changes: 27 additions & 3 deletions extensions/css/syntaxes/css.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/octref/language-css/commit/6d3a2d01dd67ef062030f4520dd42a5424330a3b",
"version": "https://github.com/octref/language-css/commit/377734aad976be88a425aab5667784f3f71ea7e5",
"name": "CSS",
"scopeName": "source.css",
"patterns": [
Expand Down Expand Up @@ -606,8 +606,32 @@
]
},
{
"begin": "(?i)(?=@[\\w-]+(\\s|\\(|{|;|/\\*|$))",
"end": "(?<=}|;)(?!\\G)",
"begin": "(?i)(?=@[\\w-]+[^;]+;s*$)",
"end": "(?<=;)(?!\\G)",
"patterns": [
{
"begin": "(?i)\\G(@)[\\w-]+",
"beginCaptures": {
"0": {
"name": "keyword.control.at-rule.css"
},
"1": {
"name": "punctuation.definition.keyword.css"
}
},
"end": ";",
"endCaptures": {
"0": {
"name": "punctuation.terminator.rule.css"
}
},
"name": "meta.at-rule.header.css"
}
]
},
{
"begin": "(?i)(?=@[\\w-]+(\\s|\\(|{|/\\*|$))",
"end": "(?<=})(?!\\G)",
"patterns": [
{
"begin": "(?i)\\G(@)[\\w-]+",
Expand Down
2 changes: 1 addition & 1 deletion extensions/fsharp/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "ionide/ionide-fsgrammar",
"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
"commitHash": "b2100c95d7857c5421d111a860fcdd20954a0263"
"commitHash": "b57388e5a0971412c081cf0cea8b50b9c24ea4e8"
}
},
"license": "MIT",
Expand Down
52 changes: 51 additions & 1 deletion extensions/fsharp/syntaxes/fsharp.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/ionide/ionide-fsgrammar/commit/b2100c95d7857c5421d111a860fcdd20954a0263",
"version": "https://github.com/ionide/ionide-fsgrammar/commit/b57388e5a0971412c081cf0cea8b50b9c24ea4e8",
"name": "fsharp",
"scopeName": "source.fsharp",
"patterns": [
Expand Down Expand Up @@ -335,6 +335,44 @@
}
]
},
"anonymous_record_declaration": {
"begin": "(\\{\\|)",
"end": "(\\|\\})",
"beginCaptures": {
"1": {
"name": "keyword.symbol.fsharp"
}
},
"endCaptures": {
"1": {
"name": "keyword.symbol.fsharp"
}
},
"patterns": [
{
"match": "[[:alpha:]0-9'`^_ ]+(:)",
"captures": {
"1": {
"name": "keyword.symbol.fsharp"
}
}
},
{
"match": "([[:alpha:]0-9'`^_ ]+)",
"captures": {
"1": {
"name": "entity.name.type.fsharp"
}
}
},
{
"include": "#anonymous_record_declaration"
},
{
"include": "#keywords"
}
]
},
"record_signature": {
"patterns": [
{
Expand Down Expand Up @@ -819,6 +857,9 @@
}
]
},
{
"include": "#anonymous_record_declaration"
},
{
"begin": "({)",
"end": "(})",
Expand Down Expand Up @@ -982,6 +1023,9 @@
}
}
},
{
"include": "#anonymous_record_declaration"
},
{
"include": "#keywords"
}
Expand Down Expand Up @@ -1062,6 +1106,9 @@
"name": "entity.name.section.fsharp"
}
}
},
{
"include": "#comments"
}
]
},
Expand Down Expand Up @@ -1255,6 +1302,9 @@
}
}
},
{
"include": "#anonymous_record_declaration"
},
{
"begin": "(\\?{0,1})([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`^._ ]+)(<))",
"end": "(>)",
Expand Down
2 changes: 1 addition & 1 deletion extensions/make/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "fadeevab/make.tmbundle",
"repositoryUrl": "https://github.com/fadeevab/make.tmbundle",
"commitHash": "bd71f44ea55d61be711bd7676e600a7333cc79ea"
"commitHash": "1b05209b483f81f42270bdda5514590e013e4896"
}
},
"licenseDetail": [
Expand Down
5 changes: 4 additions & 1 deletion extensions/make/syntaxes/make.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/fadeevab/make.tmbundle/commit/bd71f44ea55d61be711bd7676e600a7333cc79ea",
"version": "https://github.com/fadeevab/make.tmbundle/commit/1b05209b483f81f42270bdda5514590e013e4896",
"name": "Makefile",
"scopeName": "source.makefile",
"patterns": [
Expand Down Expand Up @@ -132,6 +132,9 @@
},
{
"include": "#comment"
},
{
"include": "#directives"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion extensions/rust/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "language-rust",
"repositoryUrl": "https://github.com/zargony/atom-language-rust",
"commitHash": "5238d9834953ed7c58d9b5b9bb0c084c3c11ecd6"
"commitHash": "7d59e2ad79fbe5925bd2fd3bd3857bf9f421ff6f"
}
},
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions extensions/rust/syntaxes/rust.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/zargony/atom-language-rust/commit/5238d9834953ed7c58d9b5b9bb0c084c3c11ecd6",
"version": "https://github.com/zargony/atom-language-rust/commit/7d59e2ad79fbe5925bd2fd3bd3857bf9f421ff6f",
"name": "Rust",
"scopeName": "source.rust",
"patterns": [
Expand Down Expand Up @@ -160,7 +160,7 @@
{
"comment": "Control keyword",
"name": "keyword.control.rust",
"match": "\\b(break|continue|else|if|in|for|loop|match|return|while)\\b"
"match": "\\b(async|await|break|continue|else|if|in|for|loop|match|return|try|while)\\b"
},
{
"comment": "Keyword",
Expand Down

0 comments on commit 96410ff

Please sign in to comment.