Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-04 01:08:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12185 - Veykril:parse-fix, r=Veykril

Browse source 
fix: Remap float parts as integers when parsed as indices

cc https://github.com/rust-lang/rust-analyzer/pull/12149
This commit is contained in:
bors 2022-05-07 10:53:37 +00:00
commit 6f6e4efc3b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/parser/src/grammar.rs
View file

@ -323,8 +323,8 @@ fn name_ref_or_index(p: &mut Parser) {
p.at(IDENT) || p.at(INT_NUMBER) || p.at(FLOAT_NUMBER_PART) || p.at_ts(FLOAT_LITERAL_FIRST) p.at(IDENT) || p.at(INT_NUMBER) || p.at(FLOAT_NUMBER_PART) || p.at_ts(FLOAT_LITERAL_FIRST)
); );
let m = p.start(); let m = p.start();
if p.at_ts(FLOAT_LITERAL_FIRST) { if p.at(FLOAT_NUMBER_PART) || p.at_ts(FLOAT_LITERAL_FIRST) {
p.bump_remap(FLOAT_NUMBER_PART); p.bump_remap(INT_NUMBER);
} else { } else {
p.bump_any(); p.bump_any();
} }

6
crates/parser/test_data/parser/inline/ok/0011_field_expr.rast
View file

@ -50,7 +50,7 @@ SOURCE_FILE
IDENT "x" IDENT "x"
DOT "." DOT "."
NAME_REF NAME_REF
FLOAT_NUMBER_PART "0" INT_NUMBER "0"
DOT "." DOT "."
WHITESPACE " " WHITESPACE " "
NAME_REF NAME_REF
@ -67,10 +67,10 @@ SOURCE_FILE
IDENT "x" IDENT "x"
DOT "." DOT "."
NAME_REF NAME_REF
FLOAT_NUMBER_PART "0" INT_NUMBER "0"
DOT "." DOT "."
NAME_REF NAME_REF
FLOAT_NUMBER_PART "1" INT_NUMBER "1"
SEMICOLON ";" SEMICOLON ";"
WHITESPACE "\n " WHITESPACE "\n "
EXPR_STMT EXPR_STMT