language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert source_analyzer changes

Browse source
This commit is contained in:
Kirill Bulatov 2020-02-12 17:34:17 +02:00
parent afc1d18ff3
commit f65daf23df
2 changed files with 6 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/ra_hir/src/code_model.rs
View file

@ -696,7 +696,6 @@ impl AssocItem {
AssocItem::TypeAlias(t) => t.module(db), AssocItem::TypeAlias(t) => t.module(db),
} }
} }
pub fn container(self, db: &impl DefDatabase) -> AssocItemContainer { pub fn container(self, db: &impl DefDatabase) -> AssocItemContainer {
let container = match self { let container = match self {
AssocItem::Function(it) => it.id.lookup(db).container, AssocItem::Function(it) => it.id.lookup(db).container,

60
crates/ra_hir/src/source_analyzer.rs
View file

@ -20,10 +20,7 @@ use hir_def::{
use hir_expand::{ use hir_expand::{
hygiene::Hygiene, name::AsName, AstId, HirFileId, InFile, MacroCallId, MacroCallKind, hygiene::Hygiene, name::AsName, AstId, HirFileId, InFile, MacroCallId, MacroCallKind,
}; };
use hir_ty::{ use hir_ty::{InEnvironment, InferenceResult, TraitEnvironment};
method_resolution::{iterate_method_candidates, LookupMode},
Canonical, InEnvironment, InferenceResult, TraitEnvironment,
};
use ra_syntax::{ use ra_syntax::{
ast::{self, AstNode}, ast::{self, AstNode},
AstPtr, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange, TextUnit, AstPtr, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange, TextUnit,
@ -31,8 +28,8 @@ use ra_syntax::{
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use crate::{ use crate::{
db::HirDatabase, Adt, AssocItem, Const, DefWithBody, EnumVariant, Function, Local, MacroDef, db::HirDatabase, Adt, Const, DefWithBody, EnumVariant, Function, Local, MacroDef, Name, Path,
ModuleDef, Name, Path, ScopeDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, ScopeDef, Static, Struct, Trait, Type, TypeAlias, TypeParam,
}; };
/// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of /// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of
@ -292,11 +289,9 @@ impl SourceAnalyzer {
pub fn resolve_path(&self, db: &impl HirDatabase, path: &ast::Path) -> Option<PathResolution> { pub fn resolve_path(&self, db: &impl HirDatabase, path: &ast::Path) -> Option<PathResolution> {
if let Some(path_expr) = path.syntax().parent().and_then(ast::PathExpr::cast) { if let Some(path_expr) = path.syntax().parent().and_then(ast::PathExpr::cast) {
let path_resolution = self let expr_id = self.expr_id(&path_expr.into())?;
.resolve_as_full_path(path_expr.clone()) if let Some(assoc) = self.infer.as_ref()?.assoc_resolutions_for_expr(expr_id) {
.or_else(|| self.resolve_as_path_to_method(db, &path_expr)); return Some(PathResolution::AssocItem(assoc.into()));
if path_resolution.is_some() {
return path_resolution;
} }
} }
if let Some(path_pat) = path.syntax().parent().and_then(ast::PathPat::cast) { if let Some(path_pat) = path.syntax().parent().and_then(ast::PathPat::cast) {
@ -310,49 +305,6 @@ impl SourceAnalyzer {
self.resolve_hir_path(db, &hir_path) self.resolve_hir_path(db, &hir_path)
} }
fn resolve_as_full_path(&self, path_expr: ast::PathExpr) -> Option<PathResolution> {
let expr_id = self.expr_id(&path_expr.into())?;
self.infer
.as_ref()?
.assoc_resolutions_for_expr(expr_id)
.map(|assoc| PathResolution::AssocItem(assoc.into()))
}
fn resolve_as_path_to_method(
&self,
db: &impl HirDatabase,
path_expr: &ast::PathExpr,
) -> Option<PathResolution> {
let full_path = path_expr.path()?;
let path_to_method = full_path.qualifier()?;
let method_name = full_path.segment()?.syntax().to_string();
match self.resolve_path(db, &path_to_method)? {
PathResolution::Def(ModuleDef::Adt(adt)) => {
let ty = adt.ty(db);
iterate_method_candidates(
&Canonical { value: ty.ty.value, num_vars: 0 },
db,
ty.ty.environment,
self.resolver.krate()?,
&self.resolver.traits_in_scope(db),
None,
LookupMode::Path,
|_, assoc_item_id| {
let assoc = assoc_item_id.into();
if let AssocItem::Function(function) = assoc {
if function.name(db).to_string() == method_name {
return Some(assoc);
}
}
None
},
)
}
_ => None,
}
.map(PathResolution::AssocItem)
}
fn resolve_local_name(&self, name_ref: &ast::NameRef) -> Option<ScopeEntryWithSyntax> { fn resolve_local_name(&self, name_ref: &ast::NameRef) -> Option<ScopeEntryWithSyntax> {
let name = name_ref.as_name(); let name = name_ref.as_name();
let source_map = self.body_source_map.as_ref()?; let source_map = self.body_source_map.as_ref()?;