Skip to content
This repository has been archived by the owner on Nov 5, 2021. It is now read-only.

Rust: highlighting raw strings and fix chars with escapes #167

Merged
merged 1 commit into from
Oct 29, 2021
Merged

Rust: highlighting raw strings and fix chars with escapes #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 53 additions & 3 deletions src/rust/rust.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,57 @@ testTokenization('rust', [
]
}
],
// Raw String
[
{
line: 'r"This is a raw string" ',
tokens: [
{ startIndex: 0, type: 'string.quote.rust' },
{ startIndex: 2, type: 'string.rust' },
{ startIndex: 22, type: 'string.quote.rust' },
{ startIndex: 23, type: 'white.rust' }
]
}
],
[
{
line: 'r#"This is a raw string"# ',
tokens: [
{ startIndex: 0, type: 'string.quote.rust' },
{ startIndex: 3, type: 'string.rust' },
{ startIndex: 23, type: 'string.quote.rust' },
{ startIndex: 25, type: 'white.rust' }
]
}
],
[
{
line: 'r##"This is a# raw string"## ',
tokens: [
{ startIndex: 0, type: 'string.quote.rust' },
{ startIndex: 4, type: 'string.rust' },
{ startIndex: 25, type: 'string.quote.rust' },
{ startIndex: 28, type: 'white.rust' }
]
}
],
[
{
line: 'r###"This is multi-line',
tokens: [
{ startIndex: 0, type: 'string.quote.rust' },
{ startIndex: 5, type: 'string.rust' }
]
},
{
line: 'raw "##string"### ',
tokens: [
{ startIndex: 0, type: 'string.rust' },
{ startIndex: 13, type: 'string.quote.rust' },
{ startIndex: 17, type: 'white.rust' }
]
}
],
// Byte literal
[
{
Expand All @@ -40,17 +91,16 @@ testTokenization('rust', [
],
[
{
line: "'\"'",
line: "'\\\"'",
tokens: [{ startIndex: 0, type: 'string.byteliteral.rust' }]
}
],
[
{
line: "'\0'",
line: "'\\0'",
tokens: [{ startIndex: 0, type: 'string.byteliteral.rust' }]
}
],

// Comment
[
{
Expand Down
19 changes: 18 additions & 1 deletion src/rust/rust.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ export const language = <languages.IMonarchLanguage>{

tokenizer: {
root: [
// Raw string literals
[/r(#*)"/, { token: 'string.quote', bracket: '@open', next: '@stringraw.$1' }],
[
/[a-zA-Z][a-zA-Z0-9_]*!?|_[a-zA-Z0-9_]+/,
{
Expand All @@ -287,7 +289,7 @@ export const language = <languages.IMonarchLanguage>{
// Lifetime annotations
[/'[a-zA-Z_][a-zA-Z0-9_]*(?=[^\'])/, 'identifier'],
// Byte literal
[/'\S'/, 'string.byteliteral'],
[/'(\S|@escapes)'/, 'string.byteliteral'],
// Strings
[/"/, { token: 'string.quote', bracket: '@open', next: '@string' }],
{ include: '@numbers' },
Expand Down Expand Up @@ -326,6 +328,21 @@ export const language = <languages.IMonarchLanguage>{
[/\\./, 'string.escape.invalid'],
[/"/, { token: 'string.quote', bracket: '@close', next: '@pop' }]
],

stringraw: [
[/[^"#]+/, { token: 'string' }],
[
/"(#*)/,
{
cases: {
'$1==$S2': { token: 'string.quote', bracket: '@close', next: '@pop' },
'@default': { token: 'string' }
}
}
],
[/["#]/, { token: 'string' }]
],

numbers: [
//Octal
[/(0o[0-7_]+)(@intSuffixes)?/, { token: 'number' }],
Expand Down