language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

rough, but appears to work

Browse source
This commit is contained in:
Jeroen Vannevel 2022-02-15 14:39:22 +00:00
parent f0210f8a43
commit 73e49493bd
No known key found for this signature in database
GPG key ID: 78EF5F52F38C49BD
9 changed files with 81 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir_def/src/item_tree/pretty.rs
View file

@ -496,11 +496,11 @@ impl<'a> Printer<'a> {
let (ret, args) =
args_and_ret.split_last().expect("TypeRef::Fn is missing return type");
w!(self, "fn(");
for (i, arg) in args.iter().enumerate() {
for (i, (name, typeref)) in args.iter().enumerate() {
if i != 0 {
w!(self, ", ");
}
self.print_type_ref(arg);
self.print_type_ref(&typeref);
}
if *varargs {
if !args.is_empty() {
@ -509,7 +509,7 @@ impl<'a> Printer<'a> {
w!(self, "...");
}
w!(self, ") -> ");
self.print_type_ref(ret);
self.print_type_ref(&ret.1);
}
TypeRef::Macro(_ast_id) => {
w!(self, "<macro>");

18
crates/hir_def/src/type_ref.rs
View file

@ -3,7 +3,7 @@
use hir_expand::{name::Name, AstId, InFile};
use std::convert::TryInto;
use syntax::ast;
use syntax::{ast, AstNode};
use crate::{body::LowerCtx, intern::Interned, path::Path};
@ -89,7 +89,7 @@ pub enum TypeRef {
Array(Box<TypeRef>, ConstScalar),
Slice(Box<TypeRef>),
/// A fn pointer. Last element of the vector is the return type.
Fn(Vec<TypeRef>, bool /*varargs*/),
Fn(Vec<(Option<String>, TypeRef)>, bool /*varargs*/),
// For
ImplTrait(Vec<Interned<TypeBound>>),
DynTrait(Vec<Interned<TypeBound>>),
@ -188,11 +188,16 @@ impl TypeRef {
is_varargs = param.dotdotdot_token().is_some();
}
pl.params().map(|p| p.ty()).map(|it| TypeRef::from_ast_opt(ctx, it)).collect()
pl.params().map(|p| (p.pat(), p.ty())).map(|it| {
println!("{it:?}");
let type_ref = TypeRef::from_ast_opt(ctx, it.1);
let name = it.0.unwrap().syntax().text().to_string();
(Some(name), type_ref)
}).collect()
} else {
Vec::new()
};
params.push(ret_ty);
params.push((None, ret_ty));
TypeRef::Fn(params, is_varargs)
}
// for types are close enough for our purposes to the inner type for now...
@ -230,7 +235,10 @@ impl TypeRef {
fn go(type_ref: &TypeRef, f: &mut impl FnMut(&TypeRef)) {
f(type_ref);
match type_ref {
TypeRef::Fn(types, _) | TypeRef::Tuple(types) => {
TypeRef::Fn(types, _) => {
types.iter().for_each(|t| go(&t.1, f))
}
TypeRef::Tuple(types) => {
types.iter().for_each(|t| go(t, f))
}
TypeRef::RawPtr(type_ref, _)