Skip to content

Commit d770f22

Browse files
bors[bot]matklad
bors[bot]
and
matklad
authored
Merge #2420
2420: Remove last traces of adt from Ty r=matklad a=matklad Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2 parents 3206b83 + 936c695 commit d770f22

File tree

8 files changed

+70
-77
lines changed

8 files changed

+70
-77
lines changed

‎crates/ra_hir/src/code_model.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ impl ImplBlock {
982982
}
983983
}
984984

985-
#[derive(Clone, PartialEq, Eq)]
985+
#[derive(Clone, PartialEq, Eq, Debug)]
986986
pub struct Type {
987987
pub(crate) krate: CrateId,
988988
pub(crate) ty: InEnvironment<Ty>,
@@ -1104,7 +1104,7 @@ impl Type {
11041104

11051105
pub fn as_adt(&self) -> Option<Adt> {
11061106
let (adt, _subst) = self.ty.value.as_adt()?;
1107-
Some(adt)
1107+
Some(adt.into())
11081108
}
11091109

11101110
fn derived(&self, ty: Ty) -> Type {

‎crates/ra_hir/src/expr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::{
1212
db::HirDatabase,
1313
diagnostics::{MissingFields, MissingOkInTailExpr},
1414
ty::{ApplicationTy, InferenceResult, Ty, TypeCtor},
15-
Adt, Function, Name, Path,
15+
Function, Name, Path, Struct,
1616
};
1717

1818
pub use hir_def::{
@@ -69,7 +69,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
6969
}
7070

7171
let struct_def = match self.infer[id].as_adt() {
72-
Some((Adt::Struct(s), _)) => s,
72+
Some((AdtId::StructId(s), _)) => Struct::from(s),
7373
_ => return,
7474
};
7575

‎crates/ra_hir/src/ty.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ use hir_def::{
2222
expr::ExprId, generics::GenericParams, type_ref::Mutability, AdtId, ContainerId, DefWithBodyId,
2323
GenericDefId, HasModule, Lookup, TraitId, TypeAliasId,
2424
};
25+
use hir_expand::name::Name;
2526
use ra_db::{impl_intern_key, salsa};
2627

2728
use crate::{
2829
db::HirDatabase,
2930
ty::primitive::{FloatTy, IntTy, Uncertain},
3031
util::make_mut_slice,
31-
Adt, Crate, Name,
32+
Crate,
3233
};
3334
use display::{HirDisplay, HirFormatter};
3435

@@ -598,10 +599,10 @@ impl Ty {
598599
}
599600
}
600601

601-
pub fn as_adt(&self) -> Option<(Adt, &Substs)> {
602+
pub fn as_adt(&self) -> Option<(AdtId, &Substs)> {
602603
match self {
603604
Ty::Apply(ApplicationTy { ctor: TypeCtor::Adt(adt_def), parameters }) => {
604-
Some(((*adt_def).into(), parameters))
605+
Some((*adt_def, parameters))
605606
}
606607
_ => None,
607608
}

‎crates/ra_ide_api/src/goto_definition.rs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,11 @@ pub(crate) fn reference_definition(
7171
Some(nav) => return Exact(nav),
7272
None => return Approximate(vec![]),
7373
},
74-
Some(SelfType(ty)) => {
75-
if let Some((adt, _)) = ty.as_adt() {
76-
return Exact(adt.to_nav(db));
77-
}
74+
Some(SelfType(imp)) => {
75+
// FIXME: ideally, this should point to the type in the impl, and
76+
// not at the whole impl. And goto **type** definition should bring
77+
// us to the actual type
78+
return Exact(imp.to_nav(db));
7879
}
7980
Some(Local(local)) => return Exact(local.to_nav(db)),
8081
Some(GenericParam(_)) => {
@@ -503,7 +504,7 @@ mod tests {
503504
}
504505
}
505506
",
506-
"Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
507+
"impl IMPL_BLOCK FileId(1) [12; 73)",
507508
);
508509

509510
check_goto(
@@ -516,7 +517,7 @@ mod tests {
516517
}
517518
}
518519
",
519-
"Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
520+
"impl IMPL_BLOCK FileId(1) [12; 73)",
520521
);
521522

522523
check_goto(
@@ -529,7 +530,7 @@ mod tests {
529530
}
530531
}
531532
",
532-
"Foo ENUM_DEF FileId(1) [0; 14) [5; 8)",
533+
"impl IMPL_BLOCK FileId(1) [15; 75)",
533534
);
534535

535536
check_goto(
@@ -541,7 +542,7 @@ mod tests {
541542
}
542543
}
543544
",
544-
"Foo ENUM_DEF FileId(1) [0; 14) [5; 8)",
545+
"impl IMPL_BLOCK FileId(1) [15; 62)",
545546
);
546547
}
547548

@@ -560,7 +561,7 @@ mod tests {
560561
}
561562
}
562563
",
563-
"Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
564+
"impl IMPL_BLOCK FileId(1) [49; 115)",
564565
);
565566

566567
check_goto(
@@ -572,11 +573,11 @@ mod tests {
572573
}
573574
impl Make for Foo {
574575
fn new() -> Self<|> {
575-
Self{}
576+
Self {}
576577
}
577578
}
578579
",
579-
"Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
580+
"impl IMPL_BLOCK FileId(1) [49; 115)",
580581
);
581582
}
582583

‎crates/ra_ide_api/src/hover.rs

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,12 @@ fn hover_text_from_name_kind(
133133
hir::ModuleDef::TypeAlias(it) => from_def_source(db, it),
134134
hir::ModuleDef::BuiltinType(it) => Some(it.to_string()),
135135
},
136-
SelfType(ty) => match ty.as_adt() {
137-
Some((adt_def, _)) => match adt_def {
138-
hir::Adt::Struct(it) => from_def_source(db, it),
139-
hir::Adt::Union(it) => from_def_source(db, it),
140-
hir::Adt::Enum(it) => from_def_source(db, it),
141-
},
142-
_ => None,
143-
},
144136
Local(_) => {
145137
// Hover for these shows type names
146138
*no_fallback = true;
147139
None
148140
}
149-
GenericParam(_) => {
141+
GenericParam(_) | SelfType(_) => {
150142
// FIXME: Hover for generic param
151143
None
152144
}
@@ -622,49 +614,52 @@ fn func(foo: i32) { if true { <|>foo; }; }
622614
",
623615
);
624616
let hover = analysis.hover(position).unwrap().unwrap();
625-
assert_eq!(trim_markup_opt(hover.info.first()), Some("struct Thing"));
626-
assert_eq!(hover.info.is_exact(), true);
627-
628-
let (analysis, position) = single_file_with_position(
629-
"
630-
struct Thing { x: u32 }
631-
impl Thing {
632-
fn new() -> Self<|> {
633-
Self { x: 0 }
634-
}
635-
}
636-
",
637-
);
638-
let hover = analysis.hover(position).unwrap().unwrap();
639-
assert_eq!(trim_markup_opt(hover.info.first()), Some("struct Thing"));
640-
assert_eq!(hover.info.is_exact(), true);
641-
642-
let (analysis, position) = single_file_with_position(
643-
"
644-
enum Thing { A }
645-
impl Thing {
646-
pub fn new() -> Self<|> {
647-
Thing::A
648-
}
649-
}
650-
",
651-
);
652-
let hover = analysis.hover(position).unwrap().unwrap();
653-
assert_eq!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
617+
assert_eq!(trim_markup_opt(hover.info.first()), Some("Thing"));
654618
assert_eq!(hover.info.is_exact(), true);
655619

656-
let (analysis, position) = single_file_with_position(
657-
"
658-
enum Thing { A }
659-
impl Thing {
660-
pub fn thing(a: Self<|>) {
661-
}
662-
}
663-
",
664-
);
665-
let hover = analysis.hover(position).unwrap().unwrap();
666-
assert_eq!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
667-
assert_eq!(hover.info.is_exact(), true);
620+
/* FIXME: revive these tests
621+
let (analysis, position) = single_file_with_position(
622+
"
623+
struct Thing { x: u32 }
624+
impl Thing {
625+
fn new() -> Self<|> {
626+
Self { x: 0 }
627+
}
628+
}
629+
",
630+
);
631+
632+
let hover = analysis.hover(position).unwrap().unwrap();
633+
assert_eq!(trim_markup_opt(hover.info.first()), Some("Thing"));
634+
assert_eq!(hover.info.is_exact(), true);
635+
636+
let (analysis, position) = single_file_with_position(
637+
"
638+
enum Thing { A }
639+
impl Thing {
640+
pub fn new() -> Self<|> {
641+
Thing::A
642+
}
643+
}
644+
",
645+
);
646+
let hover = analysis.hover(position).unwrap().unwrap();
647+
assert_eq!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
648+
assert_eq!(hover.info.is_exact(), true);
649+
650+
let (analysis, position) = single_file_with_position(
651+
"
652+
enum Thing { A }
653+
impl Thing {
654+
pub fn thing(a: Self<|>) {
655+
}
656+
}
657+
",
658+
);
659+
let hover = analysis.hover(position).unwrap().unwrap();
660+
assert_eq!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
661+
assert_eq!(hover.info.is_exact(), true);
662+
*/
668663
}
669664

670665
#[test]

‎crates/ra_ide_api/src/references.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,7 @@ pub(crate) fn find_all_refs(
8383
NameKind::Field(field) => field.to_nav(db),
8484
NameKind::AssocItem(assoc) => assoc.to_nav(db),
8585
NameKind::Def(def) => NavigationTarget::from_def(db, def)?,
86-
NameKind::SelfType(ref ty) => match ty.as_adt() {
87-
Some((adt, _)) => adt.to_nav(db),
88-
None => return None,
89-
},
86+
NameKind::SelfType(imp) => imp.to_nav(db),
9087
NameKind::Local(local) => local.to_nav(db),
9188
NameKind::GenericParam(_) => return None,
9289
};

‎crates/ra_ide_api/src/references/classify.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ pub(crate) fn classify_name_ref(
178178
Some(NameDefinition { kind, container, visibility })
179179
}
180180
PathResolution::SelfType(impl_block) => {
181-
let ty = impl_block.target_ty(db);
182-
let kind = NameKind::SelfType(ty);
181+
let kind = NameKind::SelfType(impl_block);
183182
let container = impl_block.module(db);
184183
Some(NameDefinition { kind, container, visibility })
185184
}

‎crates/ra_ide_api/src/references/name_definition.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
//! Note that the reference search is possible for not all of the classified items.
55
66
use hir::{
7-
Adt, AssocItem, GenericParam, HasSource, Local, MacroDef, Module, ModuleDef, StructField, Ty,
8-
VariantDef,
7+
Adt, AssocItem, GenericParam, HasSource, ImplBlock, Local, MacroDef, Module, ModuleDef,
8+
StructField, VariantDef,
99
};
1010
use ra_syntax::{ast, ast::VisibilityOwner};
1111

@@ -17,7 +17,7 @@ pub enum NameKind {
1717
Field(StructField),
1818
AssocItem(AssocItem),
1919
Def(ModuleDef),
20-
SelfType(Ty),
20+
SelfType(ImplBlock),
2121
Local(Local),
2222
GenericParam(GenericParam),
2323
}

0 commit comments

Comments
 (0)