nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-22 12:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Lukas Wirth 2021-09-01 11:25:42 +02:00
parent a0d5290b7f
commit 8bbfd45d97
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ide/src/hover.rs
View File

@ -292,6 +292,7 @@ fn hover_try_expr(
// special case for two options, there is no value in showing them // special case for two options, there is no value in showing them
if let Some(option_enum) = famous_defs.core_option_Option() { if let Some(option_enum) = famous_defs.core_option_Option() {
if inner == option_enum && body == option_enum { if inner == option_enum && body == option_enum {
cov_mark::hit!(hover_try_expr_opt_opt);
return None; return None;
} }
} }
@ -326,10 +327,10 @@ fn hover_try_expr(
let body_ty = body_ty.display(sema.db).to_string(); let body_ty = body_ty.display(sema.db).to_string();
let ty_len_max = inner_ty.len().max(body_ty.len()); let ty_len_max = inner_ty.len().max(body_ty.len());
// "Propagated as: ".len() - " Type: ".len() = 8 let l = "Propagated as: ".len() - " Type: ".len();
let static_test_len_diff = 8 - s.len() as isize; let static_text_len_diff = l as isize - s.len() as isize;
let tpad = static_test_len_diff.max(0) as usize; let tpad = static_text_len_diff.max(0) as usize;
let ppad = static_test_len_diff.min(0).abs() as usize; let ppad = static_text_len_diff.min(0).abs() as usize;
res.markup = format!( res.markup = format!(
"{bt_start}{} Type: {:>pad0$}\nPropagated as: {:>pad1$}\n{bt_end}", "{bt_start}{} Type: {:>pad0$}\nPropagated as: {:>pad1$}\n{bt_end}",
@ -368,12 +369,12 @@ fn hover_type_info(
walk_and_push_ty(sema.db, &adjusted_ty, &mut push_new_def); walk_and_push_ty(sema.db, &adjusted_ty, &mut push_new_def);
let original = original.display(sema.db).to_string(); let original = original.display(sema.db).to_string();
let adjusted = adjusted_ty.display(sema.db).to_string(); let adjusted = adjusted_ty.display(sema.db).to_string();
let static_text_diff_len = "Coerced to: ".len() - "Type: ".len();
format!( format!(
"{bt_start}Type: {:>apad$}\nCoerced to: {:>opad$}\n{bt_end}", "{bt_start}Type: {:>apad$}\nCoerced to: {:>opad$}\n{bt_end}",
original, original,
adjusted, adjusted,
// 6 base padding for difference of length of the two text prefixes apad = static_text_diff_len + adjusted.len().max(original.len()),
apad = 6 + adjusted.len().max(original.len()),
opad = original.len(), opad = original.len(),
bt_start = if config.markdown() { "```text\n" } else { "" }, bt_start = if config.markdown() { "```text\n" } else { "" },
bt_end = if config.markdown() { "```\n" } else { "" } bt_end = if config.markdown() { "```\n" } else { "" }
@ -4429,6 +4430,7 @@ fn foo() -> NotResult<(), Short> {
#[test] #[test]
fn hover_try_expr_option() { fn hover_try_expr_option() {
cov_mark::check!(hover_try_expr_opt_opt);
check_hover_range( check_hover_range(
r#" r#"
//- minicore: option, try //- minicore: option, try