nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 15:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4389

Browse Source 
4389: Ascribe more correct types r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-05-09 13:58:22 +00:00 committed by GitHub
commit 77d2eaba16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ra_assists/src/handlers/add_explicit_type.rs
View File

@ -23,6 +23,7 @@ use crate::{AssistContext, AssistId, Assists};
// ```
pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
let stmt = ctx.find_node_at_offset::<LetStmt>()?;
let module = ctx.sema.scope(stmt.syntax()).module()?;
let expr = stmt.initializer()?;
let pat = stmt.pat()?;
// Must be a binding
@ -57,17 +58,17 @@ pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext) -> Optio
return None;
}
let db = ctx.db;
let new_type_string = ty.display_truncated(db, None).to_string();
let inferred_type = ty.display_source_code(ctx.db, module.into()).ok()?;
acc.add(
AssistId("add_explicit_type"),
format!("Insert explicit type '{}'", new_type_string),
format!("Insert explicit type '{}'", inferred_type),
pat_range,
|edit| {
if let Some(ascribed_ty) = ascribed_ty {
edit.replace(ascribed_ty.syntax().text_range(), new_type_string);
} else {
edit.insert(name_range.end(), format!(": {}", new_type_string));
|builder| match ascribed_ty {
Some(ascribed_ty) => {
builder.replace(ascribed_ty.syntax().text_range(), inferred_type);
}
None => {
builder.insert(name_range.end(), format!(": {}", inferred_type));
}
},
)
@ -208,7 +209,7 @@ struct Test<K, T = u8> {
}
fn main() {
let test<|>: Test<i32> = Test { t: 23, k: 33 };
let test<|>: Test<i32, u8> = Test { t: 23, k: 33 };
}"#,
);
}