Update grammars

This commit is contained in:
Alex Ross 2021-06-11 10:11:40 +02:00
parent 750390dcd3
commit 57a760e71f
No known key found for this signature in database
GPG key ID: 89DDDBA66CBA7840
9 changed files with 52 additions and 23 deletions

View file

@ -14,4 +14,4 @@
} }
], ],
"version": 1 "version": 1
} }

View file

@ -6,7 +6,7 @@
"git": { "git": {
"name": "language-php", "name": "language-php",
"repositoryUrl": "https://github.com/atom/language-php", "repositoryUrl": "https://github.com/atom/language-php",
"commitHash": "2bf736a814e1a58aa63470c1a29590bd02e924e7" "commitHash": "4cdf06a944a3b3c8884a6085c6adc6b246911646"
} }
}, },
"license": "MIT", "license": "MIT",

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/atom/language-php/commit/2bf736a814e1a58aa63470c1a29590bd02e924e7", "version": "https://github.com/atom/language-php/commit/4cdf06a944a3b3c8884a6085c6adc6b246911646",
"scopeName": "source.php", "scopeName": "source.php",
"patterns": [ "patterns": [
{ {
@ -390,7 +390,7 @@
} }
}, },
{ {
"begin": "(?i)\\b((?:require|include)(?:_once)?)\\s+", "begin": "(?i)\\b((?:require|include)(?:_once)?)(\\s+|(?=\\())",
"beginCaptures": { "beginCaptures": {
"1": { "1": {
"name": "keyword.control.import.include.php" "name": "keyword.control.import.include.php"
@ -2384,8 +2384,8 @@
"name": "punctuation.separator.delimiter.php" "name": "punctuation.separator.delimiter.php"
}, },
{ {
"match": "(?i)\\b(null|int|float|bool|string|array|object|callable|iterable|false|mixed)\\b", "match": "(?i)\\b(null|int|float|bool|string|array|object|callable|iterable|false|mixed|void)\\b",
"name": "storage.type.php" "name": "keyword.other.type.php"
}, },
{ {
"match": "(?i)\\b(parent|self)\\b", "match": "(?i)\\b(parent|self)\\b",
@ -2809,7 +2809,7 @@
"name": "constant.character.escape.php" "name": "constant.character.escape.php"
}, },
"sql-string-double-quoted": { "sql-string-double-quoted": {
"begin": "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|AND)\\b)", "begin": "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|AND|WITH)\\b)",
"beginCaptures": { "beginCaptures": {
"0": { "0": {
"name": "punctuation.definition.string.begin.php" "name": "punctuation.definition.string.begin.php"
@ -2883,7 +2883,7 @@
] ]
}, },
"sql-string-single-quoted": { "sql-string-single-quoted": {
"begin": "'\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|AND)\\b)", "begin": "'\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|AND|WITH)\\b)",
"beginCaptures": { "beginCaptures": {
"0": { "0": {
"name": "punctuation.definition.string.begin.php" "name": "punctuation.definition.string.begin.php"

View file

@ -6,11 +6,11 @@
"git": { "git": {
"name": "Ikuyadeu/vscode-R", "name": "Ikuyadeu/vscode-R",
"repositoryUrl": "https://github.com/Ikuyadeu/vscode-R", "repositoryUrl": "https://github.com/Ikuyadeu/vscode-R",
"commitHash": "e03ba9cb9b19412f48c73ea73deb6746d50bbf23" "commitHash": "866d7cbe0620d28948a89bca24d99efd6b74b9bb"
} }
}, },
"license": "MIT", "license": "MIT",
"version": "1.3.0" "version": "1.6.7"
} }
], ],
"version": 1 "version": 1

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/Ikuyadeu/vscode-R/commit/e03ba9cb9b19412f48c73ea73deb6746d50bbf23", "version": "https://github.com/Ikuyadeu/vscode-R/commit/866d7cbe0620d28948a89bca24d99efd6b74b9bb",
"name": "R", "name": "R",
"scopeName": "source.r", "scopeName": "source.r",
"patterns": [ "patterns": [
@ -180,6 +180,10 @@
"match": "(!|&{1,2}|[|]{1,2})", "match": "(!|&{1,2}|[|]{1,2})",
"name": "keyword.operator.logical.r" "name": "keyword.operator.logical.r"
}, },
{
"match": "(\\|>)",
"name": "keyword.operator.pipe.r"
},
{ {
"match": "(%between%|%chin%|%like%|%\\+%|%\\+replace%|%:%|%do%|%dopar%|%>%|%<>%|%T>%|%\\$%)", "match": "(%between%|%chin%|%like%|%\\+%|%\\+replace%|%:%|%do%|%dopar%|%>%|%<>%|%T>%|%\\$%)",
"name": "keyword.operator.other.r" "name": "keyword.operator.other.r"

View file

@ -6,12 +6,12 @@
"git": { "git": {
"name": "rust-syntax", "name": "rust-syntax",
"repositoryUrl": "https://github.com/dustypomerleau/rust-syntax", "repositoryUrl": "https://github.com/dustypomerleau/rust-syntax",
"commitHash": "7b924664814131ae4509a537bb07960fe65dcaac" "commitHash": "20462d50ff97338f42c6b64c3f421c634fd60734"
} }
}, },
"license": "MIT", "license": "MIT",
"description": "A TextMate-style grammar for Rust.", "description": "A TextMate-style grammar for Rust.",
"version": "0.4.3" "version": "0.5.0"
} }
], ],
"version": 1 "version": 1

View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.", "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." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/dustypomerleau/rust-syntax/commit/7b924664814131ae4509a537bb07960fe65dcaac", "version": "https://github.com/dustypomerleau/rust-syntax/commit/20462d50ff97338f42c6b64c3f421c634fd60734",
"name": "Rust", "name": "Rust",
"scopeName": "source.rust", "scopeName": "source.rust",
"patterns": [ "patterns": [
@ -657,8 +657,33 @@
}, },
{ {
"comment": "storage keywords", "comment": "storage keywords",
"name": "storage.type.rust", "name": "keyword.other.rust storage.type.rust",
"match": "\\b(const|enum|extern|let|macro|mod|struct|trait|type)\\b" "match": "\\b(extern|let|macro|mod)\\b"
},
{
"comment": "const keyword",
"name": "storage.modifier.rust",
"match": "\\b(const)\\b"
},
{
"comment": "type keyword",
"name": "keyword.declaration.type.rust storage.type.rust",
"match": "\\b(type)\\b"
},
{
"comment": "enum keyword",
"name": "keyword.declaration.enum.rust storage.type.rust",
"match": "\\b(enum)\\b"
},
{
"comment": "trait keyword",
"name": "keyword.declaration.trait.rust storage.type.rust",
"match": "\\b(trait)\\b"
},
{
"comment": "struct keyword",
"name": "keyword.declaration.struct.rust storage.type.rust",
"match": "\\b(struct)\\b"
}, },
{ {
"comment": "storage modifiers", "comment": "storage modifiers",
@ -940,7 +965,7 @@
"match": "\\b(trait)\\s+([A-Z][A-Za-z0-9]*)\\b", "match": "\\b(trait)\\s+([A-Z][A-Za-z0-9]*)\\b",
"captures": { "captures": {
"1": { "1": {
"name": "storage.type.rust" "name": "keyword.declaration.trait.rust storage.type.rust"
}, },
"2": { "2": {
"name": "entity.name.type.trait.rust" "name": "entity.name.type.trait.rust"
@ -952,7 +977,7 @@
"match": "\\b(struct)\\s+([A-Z][A-Za-z0-9]*)\\b", "match": "\\b(struct)\\s+([A-Z][A-Za-z0-9]*)\\b",
"captures": { "captures": {
"1": { "1": {
"name": "storage.type.rust" "name": "keyword.declaration.struct.rust storage.type.rust"
}, },
"2": { "2": {
"name": "entity.name.type.struct.rust" "name": "entity.name.type.struct.rust"
@ -964,7 +989,7 @@
"match": "\\b(enum)\\s+([A-Z][A-Za-z0-9_]*)\\b", "match": "\\b(enum)\\s+([A-Z][A-Za-z0-9_]*)\\b",
"captures": { "captures": {
"1": { "1": {
"name": "storage.type.rust" "name": "keyword.declaration.enum.rust storage.type.rust"
}, },
"2": { "2": {
"name": "entity.name.type.enum.rust" "name": "entity.name.type.enum.rust"
@ -976,7 +1001,7 @@
"match": "\\b(type)\\s+([A-Z][A-Za-z0-9_]*)\\b", "match": "\\b(type)\\s+([A-Z][A-Za-z0-9_]*)\\b",
"captures": { "captures": {
"1": { "1": {
"name": "storage.type.rust" "name": "keyword.declaration.type.rust storage.type.rust"
}, },
"2": { "2": {
"name": "entity.name.type.declaration.rust" "name": "entity.name.type.declaration.rust"

View file

@ -1101,7 +1101,7 @@
}, },
{ {
"c": "struct", "c": "struct",
"t": "source.rust storage.type.rust", "t": "source.rust keyword.declaration.struct.rust storage.type.rust",
"r": { "r": {
"dark_plus": "storage.type: #569CD6", "dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF", "light_plus": "storage.type: #0000FF",
@ -1299,7 +1299,7 @@
}, },
{ {
"c": "trait", "c": "trait",
"t": "source.rust storage.type.rust", "t": "source.rust keyword.declaration.trait.rust storage.type.rust",
"r": { "r": {
"dark_plus": "storage.type: #569CD6", "dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF", "light_plus": "storage.type: #0000FF",

View file

@ -320,7 +320,7 @@
}, },
{ {
"c": "let", "c": "let",
"t": "source.rust storage.type.rust", "t": "source.rust keyword.other.rust storage.type.rust",
"r": { "r": {
"dark_plus": "storage.type: #569CD6", "dark_plus": "storage.type: #569CD6",
"light_plus": "storage.type: #0000FF", "light_plus": "storage.type: #0000FF",