Move numeric names inside of `NameRef`

5 files changed, 32 insertions, 25 deletions

diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index 1f904434e..2bb3c0a03 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -1,13 +1,12 @@
 mod block;
-mod field_expr;
 
 use ra_rustc_lexer::unescape;
 
 use crate::{
     algo::visit::{visitor_ctx, VisitorCtx},
-    ast, SyntaxError, SyntaxErrorKind,
-    SyntaxKind::{BYTE, BYTE_STRING, CHAR, STRING},
-    SyntaxNode, TextUnit, T,
+    ast, AstNode, SyntaxError, SyntaxErrorKind,
+    SyntaxKind::{BYTE, BYTE_STRING, CHAR, INT_NUMBER, STRING},
+    SyntaxNode, SyntaxToken, TextUnit, T,
 };
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -101,7 +100,8 @@ pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
         let _ = visitor_ctx(&mut errors)
             .visit::<ast::Literal, _>(validate_literal)
             .visit::<ast::Block, _>(block::validate_block_node)
-            .visit::<ast::FieldExpr, _>(field_expr::validate_field_expr_node)
+            .visit::<ast::FieldExpr, _>(|it, errors| validate_numeric_name(it.name_ref(), errors))
+            .visit::<ast::NamedField, _>(|it, errors| validate_numeric_name(it.name_ref(), errors))
             .accept(&node);
     }
     errors
@@ -189,3 +189,18 @@ pub(crate) fn validate_block_structure(root: &SyntaxNode) {
         }
     }
 }
+
+fn validate_numeric_name(name_ref: Option<ast::NameRef>, errors: &mut Vec<SyntaxError>) {
+    if let Some(int_token) = int_token(name_ref) {
+        if int_token.text().chars().any(|c| !c.is_digit(10)) {
+            errors.push(SyntaxError::new(
+                SyntaxErrorKind::InvalidTupleIndexFormat,
+                int_token.text_range(),
+            ));
+        }
+    }
+
+    fn int_token(name_ref: Option<ast::NameRef>) -> Option<SyntaxToken> {
+        name_ref?.syntax().first_child_or_token()?.into_token().filter(|it| it.kind() == INT_NUMBER)
+    }
+}
diff --git a/crates/ra_syntax/src/validation/field_expr.rs b/crates/ra_syntax/src/validation/field_expr.rs
deleted file mode 100644
index 004f199fd..000000000
--- a/crates/ra_syntax/src/validation/field_expr.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use crate::{

-    ast::{self, FieldKind},

-    SyntaxError,

-    SyntaxErrorKind::*,

-};

-

-pub(crate) fn validate_field_expr_node(node: ast::FieldExpr, errors: &mut Vec<SyntaxError>) {

-    if let Some(FieldKind::Index(idx)) = node.field_access() {

-        if idx.text().chars().any(|c| c < '0' || c > '9') {

-            errors.push(SyntaxError::new(InvalidTupleIndexFormat, idx.text_range()));

-        }

-    }

-}

diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.txt b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.txt
index a21b29c80..465e79e7b 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.txt
@@ -30,7 +30,8 @@ SOURCE_FILE@[0; 47)
                 NAME_REF@[25; 26)
                   IDENT@[25; 26) "x"
           DOT@[26; 27) "."
-          INT_NUMBER@[27; 31) "1i32"
+          NAME_REF@[27; 31)
+            INT_NUMBER@[27; 31) "1i32"
         SEMI@[31; 32) ";"
       WHITESPACE@[32; 37) "\n    "
       EXPR_STMT@[37; 44)
@@ -41,11 +42,11 @@ SOURCE_FILE@[0; 47)
                 NAME_REF@[37; 38)
                   IDENT@[37; 38) "x"
           DOT@[38; 39) "."
-          INT_NUMBER@[39; 43) "0x01"
+          NAME_REF@[39; 43)
+            INT_NUMBER@[39; 43) "0x01"
         SEMI@[43; 44) ";"
       WHITESPACE@[44; 45) "\n"
       R_CURLY@[45; 46) "}"
   WHITESPACE@[46; 47) "\n"
-error [17; 19): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
 error [27; 31): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
 error [39; 43): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.txt
index 78054ec5a..1d2cf2761 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.txt
@@ -32,7 +32,8 @@ SOURCE_FILE@[0; 48)
                   NAME_REF@[26; 27)
                     IDENT@[26; 27) "x"
             DOT@[27; 28) "."
-            INT_NUMBER@[28; 29) "0"
+            NAME_REF@[28; 29)
+              INT_NUMBER@[28; 29) "0"
           DOT@[29; 30) "."
           NAME_REF@[30; 33)
             IDENT@[30; 33) "bar"
@@ -47,7 +48,8 @@ SOURCE_FILE@[0; 48)
                   NAME_REF@[39; 40)
                     IDENT@[39; 40) "x"
             DOT@[40; 41) "."
-            INT_NUMBER@[41; 42) "0"
+            NAME_REF@[41; 42)
+              INT_NUMBER@[41; 42) "0"
           ARG_LIST@[42; 44)
             L_PAREN@[42; 43) "("
             R_PAREN@[43; 44) ")"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.txt
index 99bd76ace..7adb662de 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.txt
@@ -31,7 +31,8 @@ SOURCE_FILE@[0; 67)
                   NAME_REF@[28; 29)
                     IDENT@[28; 29) "x"
             DOT@[29; 30) "."
-            INT_NUMBER@[30; 31) "0"
+            NAME_REF@[30; 31)
+              INT_NUMBER@[30; 31) "0"
           DOT@[31; 32) "."
           AWAIT_KW@[32; 37) "await"
         SEMI@[37; 38) ";"
@@ -48,7 +49,8 @@ SOURCE_FILE@[0; 67)
                         NAME_REF@[43; 44)
                           IDENT@[43; 44) "x"
                   DOT@[44; 45) "."
-                  INT_NUMBER@[45; 46) "0"
+                  NAME_REF@[45; 46)
+                    INT_NUMBER@[45; 46) "0"
                 ARG_LIST@[46; 48)
                   L_PAREN@[46; 47) "("
                   R_PAREN@[47; 48) ")"