rust: support raw identifiers

See https://doc.rust-lang.org/edition-guide/rust-2018/module-system/raw-identifiers.html
alecthomas · Jan 9, 2020 · 0f6a31d · 0f6a31d
1 parent 9e22bd6
commit 0f6a31d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/lexers/r/rust.go b/lexers/r/rust.go
@@ -58,7 +58,7 @@ var Rust = internal.Register(MustNewLexer(
 			{`'[a-zA-Z_]\w*`, NameAttribute, nil},
 			{`[{}()\[\],.;]`, Punctuation, nil},
 			{`[+\-*/%&|<>^!~@=:?]`, Operator, nil},
-			{`[a-zA-Z_]\w*`, Name, nil},
+			{`(r#)?[a-zA-Z_]\w*`, Name, nil},
 			{`#!?\[`, CommentPreproc, Push("attribute[")},
 			{`([A-Za-z_]\w*)(!)(\s*)([A-Za-z_]\w*)?(\s*)(\{)`, ByGroups(CommentPreproc, Punctuation, TextWhitespace, Name, TextWhitespace, Punctuation), Push("macro{")},
 			{`([A-Za-z_]\w*)(!)(\s*)([A-Za-z_]\w*)?(\()`, ByGroups(CommentPreproc, Punctuation, TextWhitespace, Name, Punctuation), Push("macro(")},

diff --git a/lexers/testdata/rust.actual b/lexers/testdata/rust.actual
@@ -9,4 +9,6 @@ fn main() {
 
     // Some comment
     println!("rect1 is {:?}", rect1);
+
+    let r#type = "valid";
 }
diff --git a/lexers/testdata/rust.expected b/lexers/testdata/rust.expected
@@ -57,6 +57,15 @@
   {"type":"TextWhitespace","value":" "},
   {"type":"Name","value":"rect1"},
   {"type":"Punctuation","value":");"},
+  {"type":"TextWhitespace","value":"\n\n    "},
+  {"type":"KeywordDeclaration","value":"let"},
+  {"type":"TextWhitespace","value":" "},
+  {"type":"Name","value":"r#type"},
+  {"type":"TextWhitespace","value":" "},
+  {"type":"Operator","value":"="},
+  {"type":"TextWhitespace","value":" "},
+  {"type":"LiteralString","value":"\"valid\""},
+  {"type":"Punctuation","value":";"},
   {"type":"TextWhitespace","value":"\n"},
   {"type":"Punctuation","value":"}"},
   {"type":"TextWhitespace","value":"\n"}