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

Merge attempt

Browse source
This commit is contained in:
Sam Mohr 2024-08-19 23:34:05 -07:00
parent 7c15c16ae0
commit 12df3a04de
No known key found for this signature in database
GPG key ID: EA41D161A3C1BC99
236 changed files with 9053 additions and 6428 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/language_server/src/analysis/tokens.rs
View file

@ -233,12 +233,12 @@ where
impl IterTokens for ModuleParams<'_> {
fn iter_tokens<'a>(&self, arena: &'a Bump) -> BumpVec<'a, Loc<Token>> {
let Self {
params,
pattern,
before_arrow: _,
after_arrow: _,
} = self;
params.iter_tokens(arena)
pattern.value.iter_tokens(arena)
}
}
@ -663,8 +663,9 @@ impl IterTokens for Loc<Expr<'_>> {
Expr::SingleQuote(_) => onetoken(Token::String, region, arena),
Expr::RecordAccess(rcd, _field) => Loc::at(region, *rcd).iter_tokens(arena),
Expr::AccessorFunction(accessor) => Loc::at(region, accessor).iter_tokens(arena),
Expr::RecordUpdater(updater) => Loc::at(region, updater).iter_tokens(arena),
Expr::TupleAccess(tup, _field) => Loc::at(region, *tup).iter_tokens(arena),
Expr::TaskAwaitBang(inner) => Loc::at(region, *inner).iter_tokens(arena),
Expr::TrySuffix { expr: inner, .. } => Loc::at(region, *inner).iter_tokens(arena),
Expr::List(lst) => lst.iter_tokens(arena),
Expr::RecordUpdate { update, fields } => (update.iter_tokens(arena).into_iter())
.chain(fields.iter().flat_map(|f| f.iter_tokens(arena)))