2019-09-30 08:58:53 +00:00
|
|
|
//! FIXME: write short doc here
|
|
|
|
|
2020-01-14 16:45:52 +00:00
|
|
|
use hir::{HirDisplay, SourceAnalyzer, SourceBinder};
|
2019-12-21 17:45:46 +00:00
|
|
|
use once_cell::unsync::Lazy;
|
|
|
|
use ra_prof::profile;
|
2019-07-19 21:20:09 +00:00
|
|
|
use ra_syntax::{
|
2020-01-14 17:02:01 +00:00
|
|
|
ast::{self, ArgListOwner, AstNode, TypeAscriptionOwner},
|
2019-10-05 14:03:03 +00:00
|
|
|
match_ast, SmolStr, SourceFile, SyntaxKind, SyntaxNode, TextRange,
|
2019-07-19 21:20:09 +00:00
|
|
|
};
|
|
|
|
|
2020-01-14 17:02:01 +00:00
|
|
|
use crate::{db::RootDatabase, FileId, FunctionSignature};
|
2019-12-21 17:45:46 +00:00
|
|
|
|
2019-08-04 21:28:36 +00:00
|
|
|
#[derive(Debug, PartialEq, Eq)]
|
2019-07-19 21:20:09 +00:00
|
|
|
pub enum InlayKind {
|
2019-08-04 21:28:36 +00:00
|
|
|
TypeHint,
|
2020-01-14 17:02:01 +00:00
|
|
|
ParameterHint,
|
2019-07-19 21:20:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct InlayHint {
|
|
|
|
pub range: TextRange,
|
2019-07-22 18:52:47 +00:00
|
|
|
pub kind: InlayKind,
|
|
|
|
pub label: SmolStr,
|
2019-07-19 21:20:09 +00:00
|
|
|
}
|
|
|
|
|
2019-11-18 17:02:28 +00:00
|
|
|
pub(crate) fn inlay_hints(
|
|
|
|
db: &RootDatabase,
|
|
|
|
file_id: FileId,
|
|
|
|
file: &SourceFile,
|
2019-12-19 14:43:41 +00:00
|
|
|
max_inlay_hint_length: Option<usize>,
|
2019-11-18 17:02:28 +00:00
|
|
|
) -> Vec<InlayHint> {
|
2020-01-14 16:45:52 +00:00
|
|
|
let mut sb = SourceBinder::new(db);
|
2020-01-16 13:31:34 +00:00
|
|
|
let mut res = Vec::new();
|
|
|
|
for node in file.syntax().descendants() {
|
|
|
|
get_inlay_hints(&mut res, &mut sb, file_id, &node, max_inlay_hint_length);
|
|
|
|
}
|
|
|
|
res
|
2019-07-19 21:20:09 +00:00
|
|
|
}
|
|
|
|
|
2019-07-21 20:28:05 +00:00
|
|
|
fn get_inlay_hints(
|
2020-01-16 13:31:34 +00:00
|
|
|
acc: &mut Vec<InlayHint>,
|
2020-01-14 16:45:52 +00:00
|
|
|
sb: &mut SourceBinder<RootDatabase>,
|
2019-07-21 20:28:05 +00:00
|
|
|
file_id: FileId,
|
|
|
|
node: &SyntaxNode,
|
2019-12-19 14:43:41 +00:00
|
|
|
max_inlay_hint_length: Option<usize>,
|
2020-01-16 13:31:34 +00:00
|
|
|
) -> Option<()> {
|
2019-12-21 17:45:46 +00:00
|
|
|
let _p = profile("get_inlay_hints");
|
2020-01-14 16:45:52 +00:00
|
|
|
let db = sb.db;
|
|
|
|
let analyzer = Lazy::new(move || sb.analyze(hir::InFile::new(file_id.into(), node), None));
|
2019-10-05 14:03:03 +00:00
|
|
|
match_ast! {
|
|
|
|
match node {
|
|
|
|
ast::LetStmt(it) => {
|
|
|
|
if it.ascribed_type().is_some() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
let pat = it.pat()?;
|
2020-01-16 13:31:34 +00:00
|
|
|
get_pat_type_hints(acc, db, &analyzer, pat, false, max_inlay_hint_length);
|
2019-10-05 14:03:03 +00:00
|
|
|
},
|
|
|
|
ast::LambdaExpr(it) => {
|
|
|
|
it.param_list().map(|param_list| {
|
|
|
|
param_list
|
|
|
|
.params()
|
|
|
|
.filter(|closure_param| closure_param.ascribed_type().is_none())
|
|
|
|
.filter_map(|closure_param| closure_param.pat())
|
2020-01-16 13:31:34 +00:00
|
|
|
.for_each(|root_pat| get_pat_type_hints(acc, db, &analyzer, root_pat, false, max_inlay_hint_length))
|
|
|
|
});
|
2019-10-05 14:03:03 +00:00
|
|
|
},
|
|
|
|
ast::ForExpr(it) => {
|
|
|
|
let pat = it.pat()?;
|
2020-01-16 13:31:34 +00:00
|
|
|
get_pat_type_hints(acc, db, &analyzer, pat, false, max_inlay_hint_length);
|
2019-10-05 14:03:03 +00:00
|
|
|
},
|
|
|
|
ast::IfExpr(it) => {
|
|
|
|
let pat = it.condition()?.pat()?;
|
2020-01-16 13:31:34 +00:00
|
|
|
get_pat_type_hints(acc, db, &analyzer, pat, true, max_inlay_hint_length);
|
2019-10-05 14:03:03 +00:00
|
|
|
},
|
|
|
|
ast::WhileExpr(it) => {
|
|
|
|
let pat = it.condition()?.pat()?;
|
2020-01-16 13:31:34 +00:00
|
|
|
get_pat_type_hints(acc, db, &analyzer, pat, true, max_inlay_hint_length);
|
2019-10-05 14:03:03 +00:00
|
|
|
},
|
|
|
|
ast::MatchArmList(it) => {
|
2020-01-16 13:31:34 +00:00
|
|
|
it.arms()
|
|
|
|
.map(|match_arm| match_arm.pats())
|
|
|
|
.flatten()
|
|
|
|
.for_each(|root_pat| get_pat_type_hints(acc, db, &analyzer, root_pat, true, max_inlay_hint_length));
|
2019-10-05 14:03:03 +00:00
|
|
|
},
|
2020-01-14 17:02:01 +00:00
|
|
|
ast::CallExpr(it) => {
|
2020-01-16 13:31:34 +00:00
|
|
|
get_param_name_hints(acc, db, &analyzer, ast::Expr::from(it));
|
2020-01-14 17:02:01 +00:00
|
|
|
},
|
|
|
|
ast::MethodCallExpr(it) => {
|
2020-01-16 13:31:34 +00:00
|
|
|
get_param_name_hints(acc, db, &analyzer, ast::Expr::from(it));
|
2020-01-14 17:02:01 +00:00
|
|
|
},
|
2020-01-16 13:31:34 +00:00
|
|
|
_ => (),
|
2019-10-05 14:03:03 +00:00
|
|
|
}
|
2020-01-16 13:31:34 +00:00
|
|
|
};
|
|
|
|
Some(())
|
2019-07-21 20:28:05 +00:00
|
|
|
}
|
2020-01-16 13:31:34 +00:00
|
|
|
|
2020-01-14 17:02:01 +00:00
|
|
|
fn get_param_name_hints(
|
2020-01-16 13:31:34 +00:00
|
|
|
acc: &mut Vec<InlayHint>,
|
2020-01-14 17:02:01 +00:00
|
|
|
db: &RootDatabase,
|
|
|
|
analyzer: &SourceAnalyzer,
|
|
|
|
expr: ast::Expr,
|
2020-01-16 13:31:34 +00:00
|
|
|
) -> Option<()> {
|
2020-01-14 17:02:01 +00:00
|
|
|
let args = match &expr {
|
2020-01-16 13:31:34 +00:00
|
|
|
ast::Expr::CallExpr(expr) => expr.arg_list()?.args(),
|
|
|
|
ast::Expr::MethodCallExpr(expr) => expr.arg_list()?.args(),
|
|
|
|
_ => return None,
|
|
|
|
};
|
2020-01-14 17:02:01 +00:00
|
|
|
|
|
|
|
let mut parameters = get_fn_signature(db, analyzer, &expr)?.parameter_names.into_iter();
|
|
|
|
|
|
|
|
if let ast::Expr::MethodCallExpr(_) = &expr {
|
|
|
|
parameters.next();
|
|
|
|
};
|
|
|
|
|
|
|
|
let hints = parameters
|
|
|
|
.zip(args)
|
|
|
|
.filter_map(|(param, arg)| {
|
2020-01-18 12:40:32 +00:00
|
|
|
if arg.syntax().kind() == SyntaxKind::LITERAL && !param.is_empty() {
|
2020-01-14 17:02:01 +00:00
|
|
|
Some((arg.syntax().text_range(), param))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.map(|(range, param_name)| InlayHint {
|
|
|
|
range,
|
|
|
|
kind: InlayKind::ParameterHint,
|
|
|
|
label: param_name.into(),
|
2020-01-16 13:31:34 +00:00
|
|
|
});
|
2020-01-14 17:02:01 +00:00
|
|
|
|
2020-01-16 13:31:34 +00:00
|
|
|
acc.extend(hints);
|
|
|
|
Some(())
|
2020-01-14 17:02:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn get_fn_signature(
|
|
|
|
db: &RootDatabase,
|
|
|
|
analyzer: &SourceAnalyzer,
|
|
|
|
expr: &ast::Expr,
|
|
|
|
) -> Option<FunctionSignature> {
|
|
|
|
match expr {
|
|
|
|
ast::Expr::CallExpr(expr) => {
|
|
|
|
// FIXME: Type::as_callable is broken for closures
|
|
|
|
let callable_def = analyzer.type_of(db, &expr.expr()?)?.as_callable()?;
|
|
|
|
match callable_def {
|
|
|
|
hir::CallableDef::FunctionId(it) => {
|
|
|
|
let fn_def = it.into();
|
|
|
|
Some(FunctionSignature::from_hir(db, fn_def))
|
|
|
|
}
|
|
|
|
hir::CallableDef::StructId(it) => FunctionSignature::from_struct(db, it.into()),
|
|
|
|
hir::CallableDef::EnumVariantId(it) => {
|
|
|
|
FunctionSignature::from_enum_variant(db, it.into())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ast::Expr::MethodCallExpr(expr) => {
|
|
|
|
let fn_def = analyzer.resolve_method_call(&expr)?;
|
|
|
|
Some(FunctionSignature::from_hir(db, fn_def))
|
|
|
|
}
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
2019-07-21 20:28:05 +00:00
|
|
|
|
2019-08-04 21:28:36 +00:00
|
|
|
fn get_pat_type_hints(
|
2020-01-16 13:31:34 +00:00
|
|
|
acc: &mut Vec<InlayHint>,
|
2019-07-26 11:10:29 +00:00
|
|
|
db: &RootDatabase,
|
|
|
|
analyzer: &SourceAnalyzer,
|
2019-08-19 11:13:58 +00:00
|
|
|
root_pat: ast::Pat,
|
2019-07-27 21:50:26 +00:00
|
|
|
skip_root_pat_hint: bool,
|
2019-12-19 14:43:41 +00:00
|
|
|
max_inlay_hint_length: Option<usize>,
|
2020-01-16 13:31:34 +00:00
|
|
|
) {
|
2019-07-27 21:50:26 +00:00
|
|
|
let original_pat = &root_pat.clone();
|
|
|
|
|
2020-01-16 13:31:34 +00:00
|
|
|
let hints = get_leaf_pats(root_pat)
|
2019-07-26 11:10:29 +00:00
|
|
|
.into_iter()
|
2019-07-27 21:50:26 +00:00
|
|
|
.filter(|pat| !skip_root_pat_hint || pat != original_pat)
|
2019-07-26 11:10:29 +00:00
|
|
|
.filter_map(|pat| {
|
2019-11-26 11:02:57 +00:00
|
|
|
let ty = analyzer.type_of_pat(db, &pat)?;
|
|
|
|
if ty.is_unknown() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
Some((pat.syntax().text_range(), ty))
|
2019-07-26 11:10:29 +00:00
|
|
|
})
|
|
|
|
.map(|(range, pat_type)| InlayHint {
|
|
|
|
range,
|
2019-08-04 21:28:36 +00:00
|
|
|
kind: InlayKind::TypeHint,
|
2019-12-19 14:43:41 +00:00
|
|
|
label: pat_type.display_truncated(db, max_inlay_hint_length).to_string().into(),
|
2020-01-16 13:31:34 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
acc.extend(hints);
|
2019-07-26 11:10:29 +00:00
|
|
|
}
|
|
|
|
|
2019-08-19 11:13:58 +00:00
|
|
|
fn get_leaf_pats(root_pat: ast::Pat) -> Vec<ast::Pat> {
|
|
|
|
let mut pats_to_process = std::collections::VecDeque::<ast::Pat>::new();
|
2019-07-26 11:10:29 +00:00
|
|
|
pats_to_process.push_back(root_pat);
|
|
|
|
|
|
|
|
let mut leaf_pats = Vec::new();
|
|
|
|
|
|
|
|
while let Some(maybe_leaf_pat) = pats_to_process.pop_front() {
|
2019-08-19 11:13:58 +00:00
|
|
|
match &maybe_leaf_pat {
|
2019-12-07 18:14:01 +00:00
|
|
|
ast::Pat::BindPat(bind_pat) => match bind_pat.pat() {
|
|
|
|
Some(pat) => pats_to_process.push_back(pat),
|
|
|
|
_ => leaf_pats.push(maybe_leaf_pat),
|
|
|
|
},
|
|
|
|
ast::Pat::TuplePat(tuple_pat) => pats_to_process.extend(tuple_pat.args()),
|
2019-08-23 12:55:21 +00:00
|
|
|
ast::Pat::RecordPat(record_pat) => {
|
|
|
|
if let Some(pat_list) = record_pat.record_field_pat_list() {
|
2019-07-27 21:50:26 +00:00
|
|
|
pats_to_process.extend(
|
|
|
|
pat_list
|
2019-08-23 12:55:21 +00:00
|
|
|
.record_field_pats()
|
|
|
|
.filter_map(|record_field_pat| {
|
|
|
|
record_field_pat
|
2019-07-27 21:50:26 +00:00
|
|
|
.pat()
|
|
|
|
.filter(|pat| pat.syntax().kind() != SyntaxKind::BIND_PAT)
|
|
|
|
})
|
|
|
|
.chain(pat_list.bind_pats().map(|bind_pat| {
|
2019-08-19 11:13:58 +00:00
|
|
|
bind_pat.pat().unwrap_or_else(|| ast::Pat::from(bind_pat))
|
2019-07-27 21:50:26 +00:00
|
|
|
})),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
2019-08-19 11:13:58 +00:00
|
|
|
ast::Pat::TupleStructPat(tuple_struct_pat) => {
|
2019-12-07 18:14:01 +00:00
|
|
|
pats_to_process.extend(tuple_struct_pat.args())
|
2019-07-27 21:50:26 +00:00
|
|
|
}
|
2019-12-07 18:14:01 +00:00
|
|
|
ast::Pat::RefPat(ref_pat) => pats_to_process.extend(ref_pat.pat()),
|
2019-07-26 11:10:29 +00:00
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
leaf_pats
|
|
|
|
}
|
|
|
|
|
2019-07-19 21:20:09 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2019-08-29 13:49:10 +00:00
|
|
|
use insta::assert_debug_snapshot;
|
2019-07-19 21:20:09 +00:00
|
|
|
|
2019-12-07 18:14:01 +00:00
|
|
|
use crate::mock_analysis::single_file;
|
|
|
|
|
2019-12-07 22:54:18 +00:00
|
|
|
#[test]
|
2019-12-19 14:18:09 +00:00
|
|
|
fn default_generic_types_should_not_be_displayed() {
|
2019-12-07 22:54:18 +00:00
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r#"
|
|
|
|
struct Test<K, T = u8> {
|
2019-12-19 10:45:00 +00:00
|
|
|
k: K,
|
2019-12-07 22:54:18 +00:00
|
|
|
t: T,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let zz = Test { t: 23, k: 33 };
|
2020-01-22 14:44:05 +00:00
|
|
|
let zz_ref = &zz;
|
2019-12-07 22:54:18 +00:00
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
|
2019-12-19 14:18:09 +00:00
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
|
2019-12-07 22:54:18 +00:00
|
|
|
[
|
|
|
|
InlayHint {
|
2019-12-19 10:45:00 +00:00
|
|
|
range: [69; 71),
|
2019-12-07 22:54:18 +00:00
|
|
|
kind: TypeHint,
|
|
|
|
label: "Test<i32>",
|
|
|
|
},
|
2020-01-22 14:44:05 +00:00
|
|
|
InlayHint {
|
|
|
|
range: [105; 111),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&Test<i32>",
|
|
|
|
},
|
2019-12-07 22:54:18 +00:00
|
|
|
]
|
|
|
|
"###
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-07-19 21:20:09 +00:00
|
|
|
#[test]
|
2019-07-27 21:50:26 +00:00
|
|
|
fn let_statement() {
|
2019-07-21 20:28:05 +00:00
|
|
|
let (analysis, file_id) = single_file(
|
2019-07-19 21:20:09 +00:00
|
|
|
r#"
|
2019-07-27 21:50:26 +00:00
|
|
|
#[derive(PartialEq)]
|
|
|
|
enum CustomOption<T> {
|
|
|
|
None,
|
|
|
|
Some(T),
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(PartialEq)]
|
|
|
|
struct Test {
|
|
|
|
a: CustomOption<u32>,
|
|
|
|
b: u8,
|
|
|
|
}
|
2019-07-19 21:20:09 +00:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
struct InnerStruct {}
|
|
|
|
|
|
|
|
let test = 54;
|
2019-07-26 11:10:29 +00:00
|
|
|
let test: i32 = 33;
|
|
|
|
let mut test = 33;
|
|
|
|
let _ = 22;
|
|
|
|
let test = "test";
|
2019-07-19 21:20:09 +00:00
|
|
|
let test = InnerStruct {};
|
2019-07-26 11:10:29 +00:00
|
|
|
|
2019-07-19 21:20:09 +00:00
|
|
|
let test = vec![222];
|
2019-07-26 11:10:29 +00:00
|
|
|
let test: Vec<_> = (0..3).collect();
|
2019-07-27 21:50:26 +00:00
|
|
|
let test = (0..3).collect::<Vec<i128>>();
|
|
|
|
let test = (0..3).collect::<Vec<_>>();
|
2019-07-26 11:10:29 +00:00
|
|
|
|
2019-07-19 21:20:09 +00:00
|
|
|
let mut test = Vec::new();
|
|
|
|
test.push(333);
|
2019-07-26 11:10:29 +00:00
|
|
|
|
2019-07-19 21:20:09 +00:00
|
|
|
let test = (42, 'a');
|
2019-07-26 11:10:29 +00:00
|
|
|
let (a, (b, c, (d, e), f)) = (2, (3, 4, (6.6, 7.7), 5));
|
2019-12-07 18:14:01 +00:00
|
|
|
let &x = &92;
|
2019-07-27 21:50:26 +00:00
|
|
|
}"#,
|
2019-07-21 20:28:05 +00:00
|
|
|
);
|
|
|
|
|
2019-12-19 14:18:09 +00:00
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
|
2019-11-15 09:56:24 +00:00
|
|
|
[
|
|
|
|
InlayHint {
|
|
|
|
range: [193; 197),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [236; 244),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [275; 279),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&str",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [539; 543),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "(i32, char)",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [566; 567),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [570; 571),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [573; 574),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [584; 585),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [577; 578),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "f64",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [580; 581),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "f64",
|
|
|
|
},
|
2019-12-07 18:14:01 +00:00
|
|
|
InlayHint {
|
|
|
|
range: [627; 628),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
2019-11-15 09:56:24 +00:00
|
|
|
]
|
|
|
|
"###
|
2019-07-27 21:50:26 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2019-12-23 15:53:35 +00:00
|
|
|
fn closure_parameters() {
|
2019-07-27 21:50:26 +00:00
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let mut start = 0;
|
|
|
|
(0..2).for_each(|increment| {
|
|
|
|
start += increment;
|
|
|
|
})
|
2019-12-23 15:53:35 +00:00
|
|
|
|
|
|
|
let multiply = |a, b, c, d| a * b * c * d;
|
|
|
|
let _: i32 = multiply(1, 2, 3, 4);
|
2020-01-22 14:44:05 +00:00
|
|
|
let multiply_ref = &multiply;
|
2019-12-23 15:53:35 +00:00
|
|
|
|
|
|
|
let return_42 = || 42;
|
2019-07-27 21:50:26 +00:00
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
|
2019-12-19 14:18:09 +00:00
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
|
2019-11-15 09:56:24 +00:00
|
|
|
[
|
|
|
|
InlayHint {
|
|
|
|
range: [21; 30),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [57; 66),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
2019-12-23 15:53:35 +00:00
|
|
|
InlayHint {
|
|
|
|
range: [114; 122),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "|…| -> i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [126; 127),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [129; 130),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [132; 133),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [135; 136),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
2020-01-22 14:44:05 +00:00
|
|
|
range: [200; 212),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&|…| -> i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [235; 244),
|
2019-12-23 15:53:35 +00:00
|
|
|
kind: TypeHint,
|
|
|
|
label: "|| -> i32",
|
|
|
|
},
|
2019-11-15 09:56:24 +00:00
|
|
|
]
|
|
|
|
"###
|
2019-07-27 21:50:26 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn for_expression() {
|
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let mut start = 0;
|
|
|
|
for increment in 0..2 {
|
|
|
|
start += increment;
|
|
|
|
}
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
|
2019-12-19 14:18:09 +00:00
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
|
2019-11-15 09:56:24 +00:00
|
|
|
[
|
|
|
|
InlayHint {
|
|
|
|
range: [21; 30),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [44; 53),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
]
|
|
|
|
"###
|
2019-07-27 21:50:26 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn if_expr() {
|
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r#"
|
|
|
|
#[derive(PartialEq)]
|
|
|
|
enum CustomOption<T> {
|
|
|
|
None,
|
|
|
|
Some(T),
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(PartialEq)]
|
|
|
|
struct Test {
|
|
|
|
a: CustomOption<u32>,
|
|
|
|
b: u8,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let test = CustomOption::Some(Test { a: CustomOption::Some(3), b: 1 });
|
|
|
|
if let CustomOption::None = &test {};
|
|
|
|
if let test = &test {};
|
|
|
|
if let CustomOption::Some(test) = &test {};
|
|
|
|
if let CustomOption::Some(Test { a, b }) = &test {};
|
|
|
|
if let CustomOption::Some(Test { a: x, b: y }) = &test {};
|
|
|
|
if let CustomOption::Some(Test { a: CustomOption::Some(x), b: y }) = &test {};
|
|
|
|
if let CustomOption::Some(Test { a: CustomOption::None, b: y }) = &test {};
|
|
|
|
if let CustomOption::Some(Test { b: y, .. }) = &test {};
|
2019-08-04 21:28:36 +00:00
|
|
|
|
2019-07-27 21:50:26 +00:00
|
|
|
if test == CustomOption::None {}
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
|
2019-12-19 14:18:09 +00:00
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
|
2019-11-15 09:56:24 +00:00
|
|
|
[
|
|
|
|
InlayHint {
|
|
|
|
range: [166; 170),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "CustomOption<Test>",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [334; 338),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&Test",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [389; 390),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&CustomOption<u32>",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [392; 393),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&u8",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [531; 532),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&u32",
|
|
|
|
},
|
|
|
|
]
|
|
|
|
"###
|
2019-07-27 21:50:26 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn while_expr() {
|
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r#"
|
|
|
|
#[derive(PartialEq)]
|
|
|
|
enum CustomOption<T> {
|
|
|
|
None,
|
|
|
|
Some(T),
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(PartialEq)]
|
|
|
|
struct Test {
|
|
|
|
a: CustomOption<u32>,
|
|
|
|
b: u8,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let test = CustomOption::Some(Test { a: CustomOption::Some(3), b: 1 });
|
|
|
|
while let CustomOption::None = &test {};
|
|
|
|
while let test = &test {};
|
|
|
|
while let CustomOption::Some(test) = &test {};
|
|
|
|
while let CustomOption::Some(Test { a, b }) = &test {};
|
|
|
|
while let CustomOption::Some(Test { a: x, b: y }) = &test {};
|
|
|
|
while let CustomOption::Some(Test { a: CustomOption::Some(x), b: y }) = &test {};
|
|
|
|
while let CustomOption::Some(Test { a: CustomOption::None, b: y }) = &test {};
|
|
|
|
while let CustomOption::Some(Test { b: y, .. }) = &test {};
|
2019-08-04 21:28:36 +00:00
|
|
|
|
2019-07-27 21:50:26 +00:00
|
|
|
while test == CustomOption::None {}
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
|
2019-12-19 14:18:09 +00:00
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
|
2019-11-15 09:56:24 +00:00
|
|
|
[
|
|
|
|
InlayHint {
|
|
|
|
range: [166; 170),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "CustomOption<Test>",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [343; 347),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&Test",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [401; 402),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&CustomOption<u32>",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [404; 405),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&u8",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [549; 550),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "&u32",
|
|
|
|
},
|
|
|
|
]
|
2019-08-07 13:14:22 +00:00
|
|
|
"###
|
2019-07-27 21:50:26 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn match_arm_list() {
|
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r#"
|
|
|
|
#[derive(PartialEq)]
|
2019-08-04 21:28:36 +00:00
|
|
|
enum CustomOption<T> {
|
2019-07-27 21:50:26 +00:00
|
|
|
None,
|
|
|
|
Some(T),
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(PartialEq)]
|
|
|
|
struct Test {
|
|
|
|
a: CustomOption<u32>,
|
|
|
|
b: u8,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
match CustomOption::Some(Test { a: CustomOption::Some(3), b: 1 }) {
|
|
|
|
CustomOption::None => (),
|
|
|
|
test => (),
|
|
|
|
CustomOption::Some(test) => (),
|
|
|
|
CustomOption::Some(Test { a, b }) => (),
|
|
|
|
CustomOption::Some(Test { a: x, b: y }) => (),
|
|
|
|
CustomOption::Some(Test { a: CustomOption::Some(x), b: y }) => (),
|
|
|
|
CustomOption::Some(Test { a: CustomOption::None, b: y }) => (),
|
|
|
|
CustomOption::Some(Test { b: y, .. }) => (),
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
|
2019-12-19 14:18:09 +00:00
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
|
2019-11-15 09:56:24 +00:00
|
|
|
[
|
|
|
|
InlayHint {
|
|
|
|
range: [311; 315),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "Test",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [358; 359),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "CustomOption<u32>",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [361; 362),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "u8",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [484; 485),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "u32",
|
|
|
|
},
|
|
|
|
]
|
|
|
|
"###
|
2019-07-21 17:51:27 +00:00
|
|
|
);
|
2019-07-19 21:20:09 +00:00
|
|
|
}
|
2019-11-19 16:40:38 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn hint_truncation() {
|
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r#"
|
|
|
|
struct Smol<T>(T);
|
|
|
|
|
|
|
|
struct VeryLongOuterName<T>(T);
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = Smol(0u32);
|
|
|
|
let b = VeryLongOuterName(0usize);
|
|
|
|
let c = Smol(Smol(0u32))
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
|
2019-12-19 14:18:09 +00:00
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, Some(8)).unwrap(), @r###"
|
2019-11-19 16:40:38 +00:00
|
|
|
[
|
|
|
|
InlayHint {
|
|
|
|
range: [74; 75),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "Smol<u32>",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [98; 99),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "VeryLongOuterName<…>",
|
|
|
|
},
|
|
|
|
InlayHint {
|
|
|
|
range: [137; 138),
|
|
|
|
kind: TypeHint,
|
|
|
|
label: "Smol<Smol<…>>",
|
|
|
|
},
|
|
|
|
]
|
|
|
|
"###
|
|
|
|
);
|
|
|
|
}
|
2020-01-14 17:02:01 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn function_call_parameter_hint() {
|
|
|
|
let (analysis, file_id) = single_file(
|
|
|
|
r#"
|
|
|
|
struct Test {}
|
|
|
|
|
|
|
|
impl Test {
|
2020-01-18 12:40:32 +00:00
|
|
|
fn method(&self, mut param: i32) -> i32 {
|
2020-01-14 17:02:01 +00:00
|
|
|
param * 2
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 12:40:32 +00:00
|
|
|
fn test_func(mut foo: i32, bar: i32, msg: &str, _: i32, last: i32) -> i32 {
|
2020-01-14 17:02:01 +00:00
|
|
|
foo + bar
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let not_literal = 1;
|
|
|
|
let _: i32 = test_func(1, 2, "hello", 3, not_literal);
|
|
|
|
let t: Test = Test {};
|
|
|
|
t.method(123);
|
|
|
|
Test::method(&t, 3456);
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
|
|
|
|
assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
|
|
|
|
[
|
|
|
|
InlayHint {
|
2020-01-18 12:40:32 +00:00
|
|
|
range: [215; 226),
|
2020-01-14 17:02:01 +00:00
|
|
|
kind: TypeHint,
|
|
|
|
label: "i32",
|
|
|
|
},
|
|
|
|
InlayHint {
|
2020-01-18 12:40:32 +00:00
|
|
|
range: [259; 260),
|
2020-01-14 17:02:01 +00:00
|
|
|
kind: ParameterHint,
|
|
|
|
label: "foo",
|
|
|
|
},
|
|
|
|
InlayHint {
|
2020-01-18 12:40:32 +00:00
|
|
|
range: [262; 263),
|
2020-01-14 17:02:01 +00:00
|
|
|
kind: ParameterHint,
|
|
|
|
label: "bar",
|
|
|
|
},
|
|
|
|
InlayHint {
|
2020-01-18 12:40:32 +00:00
|
|
|
range: [265; 272),
|
2020-01-14 17:02:01 +00:00
|
|
|
kind: ParameterHint,
|
|
|
|
label: "msg",
|
|
|
|
},
|
|
|
|
InlayHint {
|
2020-01-18 12:40:32 +00:00
|
|
|
range: [331; 334),
|
2020-01-14 17:02:01 +00:00
|
|
|
kind: ParameterHint,
|
|
|
|
label: "param",
|
|
|
|
},
|
|
|
|
InlayHint {
|
2020-01-18 12:40:32 +00:00
|
|
|
range: [358; 362),
|
2020-01-14 17:02:01 +00:00
|
|
|
kind: ParameterHint,
|
|
|
|
label: "param",
|
|
|
|
},
|
|
|
|
]
|
|
|
|
"###
|
|
|
|
);
|
|
|
|
}
|
2019-07-19 21:20:09 +00:00
|
|
|
}
|