aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-11-08 01:47:10 +0000
committerGitHub <[email protected]>2020-11-08 01:47:10 +0000
commit945900bdbf5423fdfb8542901dfb813c2ec32e09 (patch)
treee0ccb01487cbce29969dfb2e861ec239d770f8af
parentdac70603821c3f4785a285e837b220addb16d13b (diff)
parentfbd3d73bbced8c215778888cf095bfffa33f4d7b (diff)
Merge #6497
6497: vscode: fix tmGrammar issues around non-controlflow keywords r=dustypomerleau a=cynecx Addresses some of the issues mentioned here: https://github.com/dustypomerleau/rust-syntax/issues/5. In sync with https://github.com/dustypomerleau/rust-syntax/issues/6. Co-authored-by: cynecx <[email protected]>
-rw-r--r--editors/code/rust.tmGrammar.json14
1 files changed, 7 insertions, 7 deletions
diff --git a/editors/code/rust.tmGrammar.json b/editors/code/rust.tmGrammar.json
index 608a3354e..b3a10795e 100644
--- a/editors/code/rust.tmGrammar.json
+++ b/editors/code/rust.tmGrammar.json
@@ -167,7 +167,7 @@
167 "match": "(mod)\\s+((?:r#(?!crate|[Ss]elf|super))?[a-z][A-Za-z0-9_]*)", 167 "match": "(mod)\\s+((?:r#(?!crate|[Ss]elf|super))?[a-z][A-Za-z0-9_]*)",
168 "captures": { 168 "captures": {
169 "1": { 169 "1": {
170 "name": "keyword.control.rust" 170 "name": "storage.type.rust"
171 }, 171 },
172 "2": { 172 "2": {
173 "name": "entity.name.module.rust" 173 "name": "entity.name.module.rust"
@@ -180,7 +180,7 @@
180 "begin": "\\b(extern)\\s+(crate)", 180 "begin": "\\b(extern)\\s+(crate)",
181 "beginCaptures": { 181 "beginCaptures": {
182 "1": { 182 "1": {
183 "name": "keyword.control.rust" 183 "name": "storage.type.rust"
184 }, 184 },
185 "2": { 185 "2": {
186 "name": "keyword.other.crate.rust" 186 "name": "keyword.other.crate.rust"
@@ -213,7 +213,7 @@
213 "begin": "\\b(use)\\s", 213 "begin": "\\b(use)\\s",
214 "beginCaptures": { 214 "beginCaptures": {
215 "1": { 215 "1": {
216 "name": "keyword.control.rust" 216 "name": "keyword.other.rust"
217 } 217 }
218 }, 218 },
219 "end": ";", 219 "end": ";",
@@ -342,7 +342,7 @@
342 "match": "\\b(const)\\s+([A-Z][A-Za-z0-9_]*)\\b", 342 "match": "\\b(const)\\s+([A-Z][A-Za-z0-9_]*)\\b",
343 "captures": { 343 "captures": {
344 "1": { 344 "1": {
345 "name": "keyword.control.rust" 345 "name": "storage.type.rust"
346 }, 346 },
347 "2": { 347 "2": {
348 "name": "constant.other.caps.rust" 348 "name": "constant.other.caps.rust"
@@ -450,7 +450,7 @@
450 "begin": "\\b(fn)\\s+((?:r#(?!crate|[Ss]elf|super))?[A-Za-z0-9_]+)((\\()|(<))", 450 "begin": "\\b(fn)\\s+((?:r#(?!crate|[Ss]elf|super))?[A-Za-z0-9_]+)((\\()|(<))",
451 "beginCaptures": { 451 "beginCaptures": {
452 "1": { 452 "1": {
453 "name": "keyword.control.fn.rust" 453 "name": "keyword.other.fn.rust"
454 }, 454 },
455 "2": { 455 "2": {
456 "name": "entity.name.function.rust" 456 "name": "entity.name.function.rust"
@@ -643,7 +643,7 @@
643 { 643 {
644 "comment": "control flow keywords", 644 "comment": "control flow keywords",
645 "name": "keyword.control.rust", 645 "name": "keyword.control.rust",
646 "match": "\\b(async|await|break|continue|do|else|for|if|loop|match|move|return|try|where|while|yield)\\b" 646 "match": "\\b(await|break|continue|do|else|for|if|loop|match|return|try|while|yield)\\b"
647 }, 647 },
648 { 648 {
649 "comment": "storage keywords", 649 "comment": "storage keywords",
@@ -658,7 +658,7 @@
658 { 658 {
659 "comment": "other keywords", 659 "comment": "other keywords",
660 "name": "keyword.other.rust", 660 "name": "keyword.other.rust",
661 "match": "\\b(as|become|box|dyn|final|impl|in|override|priv|pub|ref|typeof|union|unsafe|unsized|use|virtual)\\b" 661 "match": "\\b(as|async|become|box|dyn|move|final|impl|in|override|priv|pub|ref|typeof|union|unsafe|unsized|use|virtual|where)\\b"
662 }, 662 },
663 { 663 {
664 "comment": "fn", 664 "comment": "fn",