mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #6248

Browse Source 
6248: Textmate grammar: prevent early termination of raw strings with hash (closes #6042) r=matklad a=dustypomerleau

Problematic sample code from #6042:

```rust
#[derive(Debug, Clone, Logos)]
enum Quoted<'source> {
    #[regex(r#"[^\\"']+"#)]
    Text(&'source str),
    #[token("\\")]
    StartEscape,
    #[token("\'", |_| Quote::Single)]
    #[token("\"", |_| Quote::Double)]
    End(Quote),

    #[error]
    Error,
}
```

Before fix:

<img width="400" alt="Screen Shot 2020-10-16 at 10 45 59" src="https://user-images.githubusercontent.com/6304651/96198390-6a726d00-0fa0-11eb-8428-e76b2866836b.png">

After fix:

<img width="400" alt="Screen Shot 2020-10-16 at 10 45 33" src="https://user-images.githubusercontent.com/6304651/96198408-7a8a4c80-0fa0-11eb-9104-ca708009fe63.png">



Co-authored-by: Dusty Pomerleau <dustypomerleau@users.noreply.github.com>
This commit is contained in:
bors[bot] 2020-10-17 22:38:04 +00:00 committed by GitHub
commit 63956e509e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editors/code/rust.tmGrammar.json
View File

@ -966,9 +966,28 @@
]
},
{
"comment": "double-quoted raw strings and raw byte strings",
"comment": "double-quoted raw strings and raw byte strings (no hash)",
"name": "string.quoted.double.rust",
"begin": "(b?r)(#*)(\")",
"begin": "(b?r)(\")",
"beginCaptures": {
"1": {
"name": "string.quoted.byte.raw.rust"
},
"2": {
"name": "punctuation.definition.string.rust"
}
},
"end": "\"",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.rust"
}
}
},
{
"comment": "double-quoted raw strings and raw byte strings (with hash)",
"name": "string.quoted.double.rust",
"begin": "(b?r)(#+)(\")",
"beginCaptures": {
"1": {
"name": "string.quoted.byte.raw.rust"
@ -980,7 +999,7 @@
"name": "punctuation.definition.string.rust"
}
},
"end": "(\")(#*)",
"end": "(\")(#+)",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.rust"