Support raw identifiers

Closes #68
tree-sitter · May 4, 2020 · 37adf54 · 37adf54
1 parent 43293d0
commit 37adf54
Show file tree

Hide file tree

Showing 4 changed files with 1,033 additions and 975 deletions.
diff --git a/corpus/expressions.txt b/corpus/expressions.txt
@@ -12,6 +12,26 @@ fn main() {
   (function_item (identifier) (parameters) (block
     (identifier))))
 
+============================================
+Raw identifiers
+============================================
+
+fn main() {
+  (r#abc as r#Def).r#ghi;
+}
+
+---
+
+(source_file
+  (function_item
+    (identifier)
+    (parameters)
+    (block
+      (field_expression
+        (parenthesized_expression
+          (type_cast_expression (identifier) (type_identifier)))
+        (field_identifier)))))
+
 ============================================
 Unary operator expressions
 ============================================

diff --git a/grammar.js b/grammar.js
@@ -1416,7 +1416,7 @@ module.exports = grammar({
       $.scoped_identifier
     ),
 
-    identifier: $ => /[a-zA-Zα-ωΑ-Ωµ_][a-zA-Zα-ωΑ-Ωµ\d_]*/,
+    identifier: $ => /(r#)?[a-zA-Zα-ωΑ-Ωµ_][a-zA-Zα-ωΑ-Ωµ\d_]*/,
 
     _reserved_identifier: $ => alias(choice(
       'default',

diff --git a/src/grammar.json b/src/grammar.json
@@ -8176,7 +8176,7 @@
     },
     "identifier": {
       "type": "PATTERN",
-      "value": "[a-zA-Zα-ωΑ-Ωµ_][a-zA-Zα-ωΑ-Ωµ\\d_]*"
+      "value": "(r#)?[a-zA-Zα-ωΑ-Ωµ_][a-zA-Zα-ωΑ-Ωµ\\d_]*"
     },
     "_reserved_identifier": {
       "type": "ALIAS",