From 416cea65a032955e394d94e5be2883ce8ed30f3d Mon Sep 17 00:00:00 2001 From: nreed Date: Wed, 14 Jul 2021 13:27:26 -0400 Subject: [PATCH 1/2] fix rust char literal highlighting #2481 --- src/rust/rust.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/rust/rust.ts b/src/rust/rust.ts index ea55d6e0..13a2e754 100644 --- a/src/rust/rust.ts +++ b/src/rust/rust.ts @@ -270,8 +270,6 @@ export const language = { tokenizer: { root: [ - // Raw string literals - [/r(?=#*")/, { token: 'string.raw', bracket: '@open', next: '@stringraw' }], [ /[a-zA-Z][a-zA-Z0-9_]*!?|_[a-zA-Z0-9_]+/, { @@ -329,10 +327,6 @@ export const language = { [/\\./, 'string.escape.invalid'], [/"/, { token: 'string.quote', bracket: '@close', next: '@pop' }] ], - stringraw: [ - [/[^#"]/, 'string.raw'], - [/(#*)".*?"\1/, { token: 'string.raw', bracket: '@close', next: '@pop' }] - ], numbers: [ //Octal [/(0o[0-7_]+)(@intSuffixes)?/, { token: 'number' }], From af103dd2f6d23ae86eabc85ea44b33ef1cbc26d2 Mon Sep 17 00:00:00 2001 From: nreed Date: Wed, 14 Jul 2021 14:41:36 -0400 Subject: [PATCH 2/2] Added byte string escape tests --- src/rust/rust.test.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/rust/rust.test.ts b/src/rust/rust.test.ts index 51be2a86..610e4975 100644 --- a/src/rust/rust.test.ts +++ b/src/rust/rust.test.ts @@ -38,7 +38,19 @@ testTokenization('rust', [ ] } ], - + [ + { + line: "'\"'", + tokens: [{ startIndex: 0, type: 'string.byteliteral.rust' }] + } + ], + [ + { + line: "'\0'", + tokens: [{ startIndex: 0, type: 'string.byteliteral.rust' }] + } + ], + // Comment [ {