squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Employ early return pattern more

Browse source
This commit is contained in:
Evgenii P 2019-08-04 08:03:17 +07:00
parent 4034ea9e4e
commit d610adfc2b
2 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/ra_hir/src/source_binder.rs
View file

@ -428,20 +428,18 @@ impl SourceAnalyzer {
let std_future_trait =
match self.resolver.resolve_path_segments(db, &std_future_path).into_fully_resolved() {
PerNs { types: Some(Resolution::Def(ModuleDef::Trait(trait_))), .. } => {
Some(trait_)
trait_
}
_ => None,
_ => return false,
};
let krate = self.resolver.krate();
if let Some(krate) = krate {
if let Some(trait_) = std_future_trait {
let canonical_ty = crate::ty::Canonical { value: ty, num_vars: 0 };
return implements_trait(&canonical_ty, db, &self.resolver, krate, trait_);
}
}
let krate = match self.resolver.krate() {
Some(krate) => krate,
_ => return false,
};
false
let canonical_ty = crate::ty::Canonical { value: ty, num_vars: 0 };
return implements_trait(&canonical_ty, db, &self.resolver, krate, std_future_trait);
}
#[cfg(test)]

34
crates/ra_ide_api/src/completion/complete_dot.rs
View file

@ -9,23 +9,27 @@ use rustc_hash::FxHashSet;
/// Complete dot accesses, i.e. fields or methods (and .await syntax).
pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
if let Some(dot_receiver) = &ctx.dot_receiver {
let receiver_ty = ctx.analyzer.type_of(ctx.db, &dot_receiver);
let dot_receiver = match &ctx.dot_receiver {
Some(expr) => expr,
_ => return,
};
if let Some(receiver_ty) = receiver_ty {
if !ctx.is_call {
complete_fields(acc, ctx, receiver_ty.clone());
}
complete_methods(acc, ctx, receiver_ty.clone());
let receiver_ty = match ctx.analyzer.type_of(ctx.db, &dot_receiver) {
Some(ty) => ty,
_ => return,
};
// Suggest .await syntax for types that implement Future trait
if ctx.analyzer.impls_future(ctx.db, receiver_ty) {
CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await")
.detail("expr.await")
.insert_text("await")
.add_to(acc);
}
}
if !ctx.is_call {
complete_fields(acc, ctx, receiver_ty.clone());
}
complete_methods(acc, ctx, receiver_ty.clone());
// Suggest .await syntax for types that implement Future trait
if ctx.analyzer.impls_future(ctx.db, receiver_ty) {
CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await")
.detail("expr.await")
.insert_text("await")
.add_to(acc);
}
}