Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Highlight assist tests

Browse source
This commit is contained in:
Aleksey Kladov 2020-03-03 17:03:46 +01:00
parent 1cca6b2a3d
commit cf0ececb7a
3 changed files with 53 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
crates/ra_assists/src/handlers/inline_local_variable.rs
View file

@ -126,7 +126,7 @@ mod tests {
fn test_inline_let_bind_literal_expr() { fn test_inline_let_bind_literal_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn bar(a: usize) {} fn bar(a: usize) {}
fn foo() { fn foo() {
let a<|> = 1; let a<|> = 1;
@ -140,7 +140,7 @@ fn foo() {
let b = a * 10; let b = a * 10;
bar(a); bar(a);
}", }",
" r"
fn bar(a: usize) {} fn bar(a: usize) {}
fn foo() { fn foo() {
<|>1 + 1; <|>1 + 1;
@ -160,7 +160,7 @@ fn foo() {
fn test_inline_let_bind_bin_expr() { fn test_inline_let_bind_bin_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn bar(a: usize) {} fn bar(a: usize) {}
fn foo() { fn foo() {
let a<|> = 1 + 1; let a<|> = 1 + 1;
@ -174,7 +174,7 @@ fn foo() {
let b = a * 10; let b = a * 10;
bar(a); bar(a);
}", }",
" r"
fn bar(a: usize) {} fn bar(a: usize) {}
fn foo() { fn foo() {
<|>(1 + 1) + 1; <|>(1 + 1) + 1;
@ -194,7 +194,7 @@ fn foo() {
fn test_inline_let_bind_function_call_expr() { fn test_inline_let_bind_function_call_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn bar(a: usize) {} fn bar(a: usize) {}
fn foo() { fn foo() {
let a<|> = bar(1); let a<|> = bar(1);
@ -208,7 +208,7 @@ fn foo() {
let b = a * 10; let b = a * 10;
bar(a); bar(a);
}", }",
" r"
fn bar(a: usize) {} fn bar(a: usize) {}
fn foo() { fn foo() {
<|>bar(1) + 1; <|>bar(1) + 1;
@ -228,7 +228,7 @@ fn foo() {
fn test_inline_let_bind_cast_expr() { fn test_inline_let_bind_cast_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn bar(a: usize): usize { a } fn bar(a: usize): usize { a }
fn foo() { fn foo() {
let a<|> = bar(1) as u64; let a<|> = bar(1) as u64;
@ -242,7 +242,7 @@ fn foo() {
let b = a * 10; let b = a * 10;
bar(a); bar(a);
}", }",
" r"
fn bar(a: usize): usize { a } fn bar(a: usize): usize { a }
fn foo() { fn foo() {
<|>(bar(1) as u64) + 1; <|>(bar(1) as u64) + 1;
@ -262,7 +262,7 @@ fn foo() {
fn test_inline_let_bind_block_expr() { fn test_inline_let_bind_block_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = { 10 + 1 }; let a<|> = { 10 + 1 };
a + 1; a + 1;
@ -275,7 +275,7 @@ fn foo() {
let b = a * 10; let b = a * 10;
bar(a); bar(a);
}", }",
" r"
fn foo() { fn foo() {
<|>{ 10 + 1 } + 1; <|>{ 10 + 1 } + 1;
if { 10 + 1 } > 10 { if { 10 + 1 } > 10 {
@ -294,7 +294,7 @@ fn foo() {
fn test_inline_let_bind_paren_expr() { fn test_inline_let_bind_paren_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = ( 10 + 1 ); let a<|> = ( 10 + 1 );
a + 1; a + 1;
@ -307,7 +307,7 @@ fn foo() {
let b = a * 10; let b = a * 10;
bar(a); bar(a);
}", }",
" r"
fn foo() { fn foo() {
<|>( 10 + 1 ) + 1; <|>( 10 + 1 ) + 1;
if ( 10 + 1 ) > 10 { if ( 10 + 1 ) > 10 {
@ -339,13 +339,13 @@ fn foo() {
fn test_call_expr() { fn test_call_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = bar(10 + 1); let a<|> = bar(10 + 1);
let b = a * 10; let b = a * 10;
let c = a as usize; let c = a as usize;
}", }",
" r"
fn foo() { fn foo() {
<|>let b = bar(10 + 1) * 10; <|>let b = bar(10 + 1) * 10;
let c = bar(10 + 1) as usize; let c = bar(10 + 1) as usize;
@ -357,14 +357,14 @@ fn foo() {
fn test_index_expr() { fn test_index_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let x = vec![1, 2, 3]; let x = vec![1, 2, 3];
let a<|> = x[0]; let a<|> = x[0];
let b = a * 10; let b = a * 10;
let c = a as usize; let c = a as usize;
}", }",
" r"
fn foo() { fn foo() {
let x = vec![1, 2, 3]; let x = vec![1, 2, 3];
<|>let b = x[0] * 10; <|>let b = x[0] * 10;
@ -377,14 +377,14 @@ fn foo() {
fn test_method_call_expr() { fn test_method_call_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let bar = vec![1]; let bar = vec![1];
let a<|> = bar.len(); let a<|> = bar.len();
let b = a * 10; let b = a * 10;
let c = a as usize; let c = a as usize;
}", }",
" r"
fn foo() { fn foo() {
let bar = vec![1]; let bar = vec![1];
<|>let b = bar.len() * 10; <|>let b = bar.len() * 10;
@ -397,7 +397,7 @@ fn foo() {
fn test_field_expr() { fn test_field_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
struct Bar { struct Bar {
foo: usize foo: usize
} }
@ -408,7 +408,7 @@ fn foo() {
let b = a * 10; let b = a * 10;
let c = a as usize; let c = a as usize;
}", }",
" r"
struct Bar { struct Bar {
foo: usize foo: usize
} }
@ -425,7 +425,7 @@ fn foo() {
fn test_try_expr() { fn test_try_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() -> Option<usize> { fn foo() -> Option<usize> {
let bar = Some(1); let bar = Some(1);
let a<|> = bar?; let a<|> = bar?;
@ -433,7 +433,7 @@ fn foo() -> Option<usize> {
let c = a as usize; let c = a as usize;
None None
}", }",
" r"
fn foo() -> Option<usize> { fn foo() -> Option<usize> {
let bar = Some(1); let bar = Some(1);
<|>let b = bar? * 10; <|>let b = bar? * 10;
@ -447,13 +447,13 @@ fn foo() -> Option<usize> {
fn test_ref_expr() { fn test_ref_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let bar = 10; let bar = 10;
let a<|> = &bar; let a<|> = &bar;
let b = a * 10; let b = a * 10;
}", }",
" r"
fn foo() { fn foo() {
let bar = 10; let bar = 10;
<|>let b = &bar * 10; <|>let b = &bar * 10;
@ -465,12 +465,12 @@ fn foo() {
fn test_tuple_expr() { fn test_tuple_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = (10, 20); let a<|> = (10, 20);
let b = a[0]; let b = a[0];
}", }",
" r"
fn foo() { fn foo() {
<|>let b = (10, 20)[0]; <|>let b = (10, 20)[0];
}", }",
@ -481,12 +481,12 @@ fn foo() {
fn test_array_expr() { fn test_array_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = [1, 2, 3]; let a<|> = [1, 2, 3];
let b = a.len(); let b = a.len();
}", }",
" r"
fn foo() { fn foo() {
<|>let b = [1, 2, 3].len(); <|>let b = [1, 2, 3].len();
}", }",
@ -497,13 +497,13 @@ fn foo() {
fn test_paren() { fn test_paren() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = (10 + 20); let a<|> = (10 + 20);
let b = a * 10; let b = a * 10;
let c = a as usize; let c = a as usize;
}", }",
" r"
fn foo() { fn foo() {
<|>let b = (10 + 20) * 10; <|>let b = (10 + 20) * 10;
let c = (10 + 20) as usize; let c = (10 + 20) as usize;
@ -515,14 +515,14 @@ fn foo() {
fn test_path_expr() { fn test_path_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let d = 10; let d = 10;
let a<|> = d; let a<|> = d;
let b = a * 10; let b = a * 10;
let c = a as usize; let c = a as usize;
}", }",
" r"
fn foo() { fn foo() {
let d = 10; let d = 10;
<|>let b = d * 10; <|>let b = d * 10;
@ -535,13 +535,13 @@ fn foo() {
fn test_block_expr() { fn test_block_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = { 10 }; let a<|> = { 10 };
let b = a * 10; let b = a * 10;
let c = a as usize; let c = a as usize;
}", }",
" r"
fn foo() { fn foo() {
<|>let b = { 10 } * 10; <|>let b = { 10 } * 10;
let c = { 10 } as usize; let c = { 10 } as usize;
@ -553,7 +553,7 @@ fn foo() {
fn test_used_in_different_expr1() { fn test_used_in_different_expr1() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = 10 + 20; let a<|> = 10 + 20;
let b = a * 10; let b = a * 10;
@ -561,7 +561,7 @@ fn foo() {
let d = [a, 10]; let d = [a, 10];
let e = (a); let e = (a);
}", }",
" r"
fn foo() { fn foo() {
<|>let b = (10 + 20) * 10; <|>let b = (10 + 20) * 10;
let c = (10 + 20, 20); let c = (10 + 20, 20);
@ -575,12 +575,12 @@ fn foo() {
fn test_used_in_for_expr() { fn test_used_in_for_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = vec![10, 20]; let a<|> = vec![10, 20];
for i in a {} for i in a {}
}", }",
" r"
fn foo() { fn foo() {
<|>for i in vec![10, 20] {} <|>for i in vec![10, 20] {}
}", }",
@ -591,12 +591,12 @@ fn foo() {
fn test_used_in_while_expr() { fn test_used_in_while_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = 1 > 0; let a<|> = 1 > 0;
while a {} while a {}
}", }",
" r"
fn foo() { fn foo() {
<|>while 1 > 0 {} <|>while 1 > 0 {}
}", }",
@ -607,14 +607,14 @@ fn foo() {
fn test_used_in_break_expr() { fn test_used_in_break_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = 1 + 1; let a<|> = 1 + 1;
loop { loop {
break a; break a;
} }
}", }",
" r"
fn foo() { fn foo() {
<|>loop { <|>loop {
break 1 + 1; break 1 + 1;
@ -627,12 +627,12 @@ fn foo() {
fn test_used_in_return_expr() { fn test_used_in_return_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = 1 > 0; let a<|> = 1 > 0;
return a; return a;
}", }",
" r"
fn foo() { fn foo() {
<|>return 1 > 0; <|>return 1 > 0;
}", }",
@ -643,12 +643,12 @@ fn foo() {
fn test_used_in_match_expr() { fn test_used_in_match_expr() {
check_assist( check_assist(
inline_local_variable, inline_local_variable,
" r"
fn foo() { fn foo() {
let a<|> = 1 > 0; let a<|> = 1 > 0;
match a {} match a {}
}", }",
" r"
fn foo() { fn foo() {
<|>match 1 > 0 {} <|>match 1 > 0 {}
}", }",

8
crates/ra_assists/src/lib.rs
View file

@ -178,8 +178,12 @@ mod helpers {
(db, file_id) (db, file_id)
} }
pub(crate) fn check_assist(assist: AssistHandler, ra_fixture: &str, after: &str) { pub(crate) fn check_assist(
check(assist, ra_fixture, ExpectedResult::After(after)); assist: AssistHandler,
ra_fixture_before: &str,
ra_fixture_after: &str,
) {
check(assist, ra_fixture_before, ExpectedResult::After(ra_fixture_after));
} }
// FIXME: instead of having a separate function here, maybe use // FIXME: instead of having a separate function here, maybe use

2
crates/ra_ide/src/syntax_highlighting.rs
View file

@ -320,7 +320,7 @@ fn highlight_injection(
let call_info = call_info_for_token(&sema, expanded)?; let call_info = call_info_for_token(&sema, expanded)?;
let idx = call_info.active_parameter?; let idx = call_info.active_parameter?;
let name = call_info.signature.parameter_names.get(idx)?; let name = call_info.signature.parameter_names.get(idx)?;
if name != "ra_fixture" { if !name.starts_with("ra_fixture") {
return None; return None;
} }
let value = literal.value()?; let value = literal.value()?;