language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix parsing of tuple accessors after an identifier - e.g. myIdent.2

Browse source
This commit is contained in:
Joshua Warner 2023-01-30 20:21:50 -08:00
parent 53b1525139
commit 31a4eb2bfd
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
8 changed files with 150 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

67
crates/compiler/parse/src/pattern.rs
View file

@ -1,6 +1,6 @@
use crate::ast::{Has, Pattern, PatternAs, Spaceable};
use crate::blankspace::{space0_e, spaces, spaces_before};
use crate::ident::{lowercase_ident, parse_ident, Ident};
use crate::ident::{lowercase_ident, parse_ident, Accessor, Ident};
use crate::keyword;
use crate::parser::Progress::{self, *};
use crate::parser::{
@ -377,34 +377,45 @@ fn loc_ident_pattern_help<'a>(
Ident::Access { module_name, parts } => {
// Plain identifiers (e.g. `foo`) are allowed in patterns, but
// more complex ones (e.g. `Foo.bar` or `foo.bar.baz`) are not.
if crate::keyword::KEYWORDS.contains(&parts[0]) {
Err((NoProgress, EPattern::End(original_state.pos())))
} else if module_name.is_empty() && parts.len() == 1 {
Ok((
MadeProgress,
Loc {
region: loc_ident.region,
value: Pattern::Identifier(parts[0]),
},
state,
))
} else {
let malformed_str = if module_name.is_empty() {
parts.join(".")
} else {
format!("{}.{}", module_name, parts.join("."))
};
Ok((
MadeProgress,
Loc {
region: loc_ident.region,
value: Pattern::Malformed(
String::from_str_in(&malformed_str, arena).into_bump_str(),
),
},
state,
))
for keyword in crate::keyword::KEYWORDS.iter() {
if parts[0] == Accessor::RecordField(keyword) {
return Err((NoProgress, EPattern::End(original_state.pos())));
}
}
if module_name.is_empty() && parts.len() == 1 {
if let Accessor::RecordField(var) = &parts[0] {
return Ok((
MadeProgress,
Loc {
region: loc_ident.region,
value: Pattern::Identifier(var),
},
state,
));
}
}
let mut malformed_str = String::new_in(arena);
if !module_name.is_empty() {
malformed_str.push_str(module_name);
};
for part in parts {
if !malformed_str.is_empty() {
malformed_str.push('.');
}
malformed_str.push_str(part.as_inner());
}
Ok((
MadeProgress,
Loc {
region: loc_ident.region,
value: Pattern::Malformed(malformed_str.into_bump_str()),
},
state,
))
}
Ident::RecordAccessorFunction(_string) => Err((
MadeProgress,