nameres::per_ns::PerNs,
resolver::{HasResolver, TypeNs},
traits::TraitData,
- type_ref::{Mutability, TypeRef},
+ type_ref::TypeRef,
ContainerId, CrateModuleId, HasModule, ImplId, LocalEnumVariantId, LocalStructFieldId, Lookup,
ModuleId, UnionId,
};
pub(crate) id: FunctionId,
}
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct FnData {
- pub(crate) name: Name,
- pub(crate) params: Vec<TypeRef>,
- pub(crate) ret_type: TypeRef,
- /// True if the first param is `self`. This is relevant to decide whether this
- /// can be called as a method.
- pub(crate) has_self_param: bool,
-}
-
-impl FnData {
- pub(crate) fn fn_data_query(
- db: &(impl DefDatabase + AstDatabase),
- func: Function,
- ) -> Arc<FnData> {
- let src = func.source(db);
- let name = src.value.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
- let mut params = Vec::new();
- let mut has_self_param = false;
- if let Some(param_list) = src.value.param_list() {
- if let Some(self_param) = param_list.self_param() {
- let self_type = if let Some(type_ref) = self_param.ascribed_type() {
- TypeRef::from_ast(type_ref)
- } else {
- let self_type = TypeRef::Path(name::SELF_TYPE.into());
- match self_param.kind() {
- ast::SelfParamKind::Owned => self_type,
- ast::SelfParamKind::Ref => {
- TypeRef::Reference(Box::new(self_type), Mutability::Shared)
- }
- ast::SelfParamKind::MutRef => {
- TypeRef::Reference(Box::new(self_type), Mutability::Mut)
- }
- }
- };
- params.push(self_type);
- has_self_param = true;
- }
- for param in param_list.params() {
- let type_ref = TypeRef::from_ast_opt(param.ascribed_type());
- params.push(type_ref);
- }
- }
- let ret_type = if let Some(type_ref) = src.value.ret_type().and_then(|rt| rt.type_ref()) {
- TypeRef::from_ast(type_ref)
- } else {
- TypeRef::unit()
- };
-
- let sig = FnData { name, params, ret_type, has_self_param };
- Arc::new(sig)
- }
- pub fn name(&self) -> &Name {
- &self.name
- }
-
- pub fn params(&self) -> &[TypeRef] {
- &self.params
- }
-
- pub fn ret_type(&self) -> &TypeRef {
- &self.ret_type
- }
-
- /// True if the first arg is `self`. This is relevant to decide whether this
- /// can be called as a method.
- pub fn has_self_param(&self) -> bool {
- self.has_self_param
- }
-}
-
impl Function {
pub fn module(self, db: &impl DefDatabase) -> Module {
self.id.lookup(db).module(db).into()
}
pub fn name(self, db: &impl HirDatabase) -> Name {
- self.data(db).name.clone()
+ db.function_data(self.id).name.clone()
+ }
+
+ pub fn has_self_param(self, db: &impl HirDatabase) -> bool {
+ db.function_data(self.id).has_self_param
+ }
+
+ pub fn params(self, db: &impl HirDatabase) -> Vec<TypeRef> {
+ db.function_data(self.id).params.clone()
}
pub(crate) fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
db.type_for_def(self.into(), Namespace::Values)
}
- pub fn data(self, db: &impl HirDatabase) -> Arc<FnData> {
- db.fn_data(self)
- }
-
pub fn infer(self, db: &impl HirDatabase) -> Arc<InferenceResult> {
db.infer(self.into())
}
CallableDef, FnSig, GenericPredicate, InferenceResult, Namespace, Substs, Ty, TypableDef,
TypeCtor,
},
- Const, ConstData, Crate, DefWithBody, FnData, Function, GenericDef, ImplBlock, Module, Static,
- StructField, Trait,
+ Const, ConstData, Crate, DefWithBody, GenericDef, ImplBlock, Module, Static, StructField,
+ Trait,
};
pub use hir_def::db::{
BodyQuery, BodyWithSourceMapQuery, CrateDefMapQuery, DefDatabase2, DefDatabase2Storage,
- EnumDataQuery, ExprScopesQuery, GenericParamsQuery, ImplDataQuery, InternDatabase,
- InternDatabaseStorage, RawItemsQuery, RawItemsWithSourceMapQuery, StructDataQuery,
- TraitDataQuery, TypeAliasDataQuery,
+ EnumDataQuery, ExprScopesQuery, FunctionDataQuery, GenericParamsQuery, ImplDataQuery,
+ InternDatabase, InternDatabaseStorage, RawItemsQuery, RawItemsWithSourceMapQuery,
+ StructDataQuery, TraitDataQuery, TypeAliasDataQuery,
};
pub use hir_expand::db::{
AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery,
#[salsa::query_group(DefDatabaseStorage)]
#[salsa::requires(AstDatabase)]
pub trait DefDatabase: HirDebugDatabase + DefDatabase2 {
- #[salsa::invoke(FnData::fn_data_query)]
- fn fn_data(&self, func: Function) -> Arc<FnData>;
-
#[salsa::invoke(ConstData::const_data_query)]
fn const_data(&self, konst: Const) -> Arc<ConstData>;
docs::{DocDef, Docs, Documentation},
src::{HasBodySource, HasSource},
Adt, AssocItem, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, Enum,
- EnumVariant, FieldSource, FnData, Function, GenericDef, GenericParam, HasBody, ImplBlock,
- Local, MacroDef, Module, ModuleDef, ModuleSource, ScopeDef, Static, Struct, StructField,
- Trait, TypeAlias, Union, VariantDef,
+ EnumVariant, FieldSource, Function, GenericDef, GenericParam, HasBody, ImplBlock, Local,
+ MacroDef, Module, ModuleDef, ModuleSource, ScopeDef, Static, Struct, StructField, Trait,
+ TypeAlias, Union, VariantDef,
},
expr::ExprScopes,
from_source::FromSource,
use rustc_hash::FxHashMap;
use hir_def::{
+ function::FunctionData,
path::known,
resolver::{HasResolver, Resolver, TypeNs},
type_ref::{Mutability, TypeRef},
db::HirDatabase,
expr::{BindingAnnotation, Body, ExprId, PatId},
ty::infer::diagnostics::InferenceDiagnostic,
- Adt, AssocItem, ConstData, DefWithBody, FloatTy, FnData, Function, HasBody, IntTy, Path,
- StructField, Trait, VariantDef,
+ Adt, AssocItem, ConstData, DefWithBody, FloatTy, Function, HasBody, IntTy, Path, StructField,
+ Trait, VariantDef,
};
macro_rules! ty_app {
match def {
DefWithBody::Const(ref c) => ctx.collect_const(&c.data(db)),
- DefWithBody::Function(ref f) => ctx.collect_fn(&f.data(db)),
+ DefWithBody::Function(ref f) => ctx.collect_fn(&db.function_data(f.id)),
DefWithBody::Static(ref s) => ctx.collect_const(&s.data(db)),
}
self.return_ty = self.make_ty(data.type_ref());
}
- fn collect_fn(&mut self, data: &FnData) {
+ fn collect_fn(&mut self, data: &FunctionData) {
let body = Arc::clone(&self.body); // avoid borrow checker problem
- for (type_ref, pat) in data.params().iter().zip(body.params()) {
+ for (type_ref, pat) in data.params.iter().zip(body.params()) {
let ty = self.make_ty(type_ref);
self.infer_pat(*pat, &ty, BindingMode::default());
}
- self.return_ty = self.make_ty(data.ret_type());
+ self.return_ty = self.make_ty(&data.ret_type);
}
fn infer_body(&mut self) {
}
fn fn_sig_for_fn(db: &impl HirDatabase, def: Function) -> FnSig {
- let data = def.data(db);
+ let data = db.function_data(def.id);
let resolver = def.id.resolver(db);
- let params = data.params().iter().map(|tr| Ty::from_hir(db, &resolver, tr)).collect::<Vec<_>>();
- let ret = Ty::from_hir(db, &resolver, data.ret_type());
+ let params = data.params.iter().map(|tr| Ty::from_hir(db, &resolver, tr)).collect::<Vec<_>>();
+ let ret = Ty::from_hir(db, &resolver, &data.ret_type);
FnSig::from_params_and_return(params, ret)
}
) -> bool {
match item {
AssocItem::Function(m) => {
- let data = m.data(db);
- name.map_or(true, |name| data.name() == name)
- && (data.has_self_param() || mode == LookupMode::Path)
+ let data = db.function_data(m.id);
+ name.map_or(true, |name| data.name == *name)
+ && (data.has_self_param || mode == LookupMode::Path)
}
AssocItem::Const(c) => {
name.map_or(true, |name| Some(name) == c.name(db).as_ref())
use crate::{
adt::{EnumData, StructData},
body::{scope::ExprScopes, Body, BodySourceMap},
+ function::FunctionData,
generics::GenericParams,
impls::ImplData,
nameres::{
},
traits::TraitData,
type_alias::TypeAliasData,
- DefWithBodyId, EnumId, GenericDefId, ImplId, ItemLoc, StructOrUnionId, TraitId, TypeAliasId,
+ DefWithBodyId, EnumId, FunctionId, GenericDefId, ImplId, ItemLoc, StructOrUnionId, TraitId,
+ TypeAliasId,
};
#[salsa::query_group(InternDatabaseStorage)]
#[salsa::invoke(TypeAliasData::type_alias_data_query)]
fn type_alias_data(&self, e: TypeAliasId) -> Arc<TypeAliasData>;
+ #[salsa::invoke(FunctionData::fn_data_query)]
+ fn function_data(&self, func: FunctionId) -> Arc<FunctionData>;
+
#[salsa::invoke(Body::body_with_source_map_query)]
fn body_with_source_map(&self, def: DefWithBodyId) -> (Arc<Body>, Arc<BodySourceMap>);
--- /dev/null
+use std::sync::Arc;
+
+use hir_expand::name::{self, AsName, Name};
+use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
+
+use crate::{
+ db::DefDatabase2,
+ type_ref::{Mutability, TypeRef},
+ FunctionId, HasSource, Lookup,
+};
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct FunctionData {
+ pub name: Name,
+ pub params: Vec<TypeRef>,
+ pub ret_type: TypeRef,
+ /// True if the first param is `self`. This is relevant to decide whether this
+ /// can be called as a method.
+ pub has_self_param: bool,
+}
+
+impl FunctionData {
+ pub(crate) fn fn_data_query(db: &impl DefDatabase2, func: FunctionId) -> Arc<FunctionData> {
+ let src = func.lookup(db).source(db);
+ let name = src.value.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
+ let mut params = Vec::new();
+ let mut has_self_param = false;
+ if let Some(param_list) = src.value.param_list() {
+ if let Some(self_param) = param_list.self_param() {
+ let self_type = if let Some(type_ref) = self_param.ascribed_type() {
+ TypeRef::from_ast(type_ref)
+ } else {
+ let self_type = TypeRef::Path(name::SELF_TYPE.into());
+ match self_param.kind() {
+ ast::SelfParamKind::Owned => self_type,
+ ast::SelfParamKind::Ref => {
+ TypeRef::Reference(Box::new(self_type), Mutability::Shared)
+ }
+ ast::SelfParamKind::MutRef => {
+ TypeRef::Reference(Box::new(self_type), Mutability::Mut)
+ }
+ }
+ };
+ params.push(self_type);
+ has_self_param = true;
+ }
+ for param in param_list.params() {
+ let type_ref = TypeRef::from_ast_opt(param.ascribed_type());
+ params.push(type_ref);
+ }
+ }
+ let ret_type = if let Some(type_ref) = src.value.ret_type().and_then(|rt| rt.type_ref()) {
+ TypeRef::from_ast(type_ref)
+ } else {
+ TypeRef::unit()
+ };
+
+ let sig = FunctionData { name, params, ret_type, has_self_param };
+ Arc::new(sig)
+ }
+}
pub mod traits;
pub mod resolver;
pub mod type_alias;
+pub mod function;
#[cfg(test)]
mod test_db;
let (callable_def, _subst) = analyzer.type_of(db, &expr.expr()?)?.as_callable()?;
match callable_def {
hir::CallableDef::Function(it) => {
- (CallInfo::with_fn(db, it), it.data(db).has_self_param())
+ (CallInfo::with_fn(db, it), it.has_self_param(db))
}
hir::CallableDef::Struct(it) => (CallInfo::with_struct(db, it)?, false),
hir::CallableDef::EnumVariant(it) => (CallInfo::with_enum_variant(db, it)?, false),
}
FnCallNode::MethodCallExpr(expr) => {
let function = analyzer.resolve_method_call(&expr)?;
- (CallInfo::with_fn(db, function), function.data(db).has_self_param())
+ (CallInfo::with_fn(db, function), function.has_self_param(db))
}
FnCallNode::MacroCallExpr(expr) => {
let macro_def = analyzer.resolve_macro_call(db, &expr)?;
hir::db::RawItemsQuery
hir::db::CrateDefMapQuery
hir::db::GenericParamsQuery
- hir::db::FnDataQuery
+ hir::db::FunctionDataQuery
hir::db::TypeAliasDataQuery
hir::db::ConstDataQuery
hir::db::StaticDataQuery
fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty) {
let mut seen_methods = FxHashSet::default();
ctx.analyzer.iterate_method_candidates(ctx.db, receiver, None, |_ty, func| {
- let data = func.data(ctx.db);
- if data.has_self_param() && seen_methods.insert(data.name().clone()) {
+ if func.has_self_param(ctx.db) && seen_methods.insert(func.name(ctx.db)) {
acc.add_function(ctx, func);
}
None::<()>
ctx.analyzer.iterate_path_candidates(ctx.db, ty.clone(), None, |_ty, item| {
match item {
hir::AssocItem::Function(func) => {
- let data = func.data(ctx.db);
- if !data.has_self_param() {
+ if !func.has_self_param(ctx.db) {
acc.add_function(ctx, func);
}
}
for item in t.items(ctx.db) {
match item {
hir::AssocItem::Function(func) => {
- let data = func.data(ctx.db);
- if !data.has_self_param() {
+ if !func.has_self_param(ctx.db) {
acc.add_function(ctx, func);
}
}
name: Option<String>,
func: hir::Function,
) {
- let data = func.data(ctx.db);
- let name = name.unwrap_or_else(|| data.name().to_string());
+ let func_name = func.name(ctx.db);
+ let has_self_param = func.has_self_param(ctx.db);
+ let params = func.params(ctx.db);
+
+ let name = name.unwrap_or_else(|| func_name.to_string());
let ast_node = func.source(ctx.db).value;
let detail = function_label(&ast_node);
let mut builder =
CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.clone())
- .kind(if data.has_self_param() {
+ .kind(if has_self_param {
CompletionItemKind::Method
} else {
CompletionItemKind::Function
{
tested_by!(inserts_parens_for_function_calls);
let (snippet, label) =
- if data.params().is_empty() || data.has_self_param() && data.params().len() == 1 {
- (format!("{}()$0", data.name()), format!("{}()", name))
+ if params.is_empty() || has_self_param && params.len() == 1 {
+ (format!("{}()$0", func_name), format!("{}()", name))
} else {
- (format!("{}($0)", data.name()), format!("{}(…)", name))
+ (format!("{}($0)", func_name), format!("{}(…)", name))
};
builder = builder.lookup_by(name).label(label).insert_snippet(snippet);
}
projects / rust.git / commitdiff