From 1cca6b2a3d4e1981577616d854bca498f4891289 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 3 Mar 2020 16:56:42 +0100 Subject: Fix applicability of inline local --- .../src/handlers/inline_local_variable.rs | 30 +++++++++++++++++++--- crates/ra_assists/src/lib.rs | 12 ++++----- crates/ra_assists/src/marks.rs | 2 ++ 3 files changed, 34 insertions(+), 10 deletions(-) (limited to 'crates/ra_assists') diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs index 53a72309b..98e5112df 100644 --- a/crates/ra_assists/src/handlers/inline_local_variable.rs +++ b/crates/ra_assists/src/handlers/inline_local_variable.rs @@ -2,9 +2,9 @@ use ra_syntax::{ ast::{self, AstNode, AstToken}, TextRange, }; +use test_utils::tested_by; -use crate::assist_ctx::ActionBuilder; -use crate::{Assist, AssistCtx, AssistId}; +use crate::{assist_ctx::ActionBuilder, Assist, AssistCtx, AssistId}; // Assist: inline_local_variable // @@ -29,6 +29,11 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option { _ => return None, }; if bind_pat.is_mutable() { + tested_by!(test_not_inline_mut_variable); + return None; + } + if !bind_pat.syntax().text_range().contains_inclusive(ctx.frange.range.start()) { + tested_by!(not_applicable_outside_of_bind_pat); return None; } let initializer_expr = let_stmt.initializer()?; @@ -111,6 +116,8 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option { #[cfg(test)] mod tests { + use test_utils::covers; + use crate::helpers::{check_assist, check_assist_not_applicable}; use super::*; @@ -317,9 +324,10 @@ fn foo() { #[test] fn test_not_inline_mut_variable() { + covers!(test_not_inline_mut_variable); check_assist_not_applicable( inline_local_variable, - " + r" fn foo() { let mut a<|> = 1 + 1; a + 1; @@ -651,11 +659,25 @@ fn foo() { fn test_not_applicable_if_variable_unused() { check_assist_not_applicable( inline_local_variable, - " + r" fn foo() { let <|>a = 0; } ", ) } + + #[test] + fn not_applicable_outside_of_bind_pat() { + covers!(not_applicable_outside_of_bind_pat); + check_assist_not_applicable( + inline_local_variable, + r" +fn main() { + let x = <|>1 + 2; + x * 4; +} +", + ) + } } diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index deeada2de..6d81a6396 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs @@ -178,19 +178,19 @@ mod helpers { (db, file_id) } - pub(crate) fn check_assist(assist: AssistHandler, before: &str, after: &str) { - check(assist, before, ExpectedResult::After(after)); + pub(crate) fn check_assist(assist: AssistHandler, ra_fixture: &str, after: &str) { + check(assist, ra_fixture, ExpectedResult::After(after)); } // FIXME: instead of having a separate function here, maybe use // `extract_ranges` and mark the target as ` ` in the // fixuture? - pub(crate) fn check_assist_target(assist: AssistHandler, before: &str, target: &str) { - check(assist, before, ExpectedResult::Target(target)); + pub(crate) fn check_assist_target(assist: AssistHandler, ra_fixture: &str, target: &str) { + check(assist, ra_fixture, ExpectedResult::Target(target)); } - pub(crate) fn check_assist_not_applicable(assist: AssistHandler, before: &str) { - check(assist, before, ExpectedResult::NotApplicable); + pub(crate) fn check_assist_not_applicable(assist: AssistHandler, ra_fixture: &str) { + check(assist, ra_fixture, ExpectedResult::NotApplicable); } enum ExpectedResult<'a> { diff --git a/crates/ra_assists/src/marks.rs b/crates/ra_assists/src/marks.rs index c20e4db9e..cef3df4e5 100644 --- a/crates/ra_assists/src/marks.rs +++ b/crates/ra_assists/src/marks.rs @@ -4,4 +4,6 @@ test_utils::marks!( introduce_var_in_comment_is_not_applicable test_introduce_var_expr_stmt test_introduce_var_last_expr + not_applicable_outside_of_bind_pat + test_not_inline_mut_variable ); -- cgit v1.2.3 From cf0ececb7aa93d5538a7688d825201327335132e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 3 Mar 2020 17:03:46 +0100 Subject: Highlight assist tests --- .../src/handlers/inline_local_variable.rs | 92 +++++++++++----------- crates/ra_assists/src/lib.rs | 8 +- 2 files changed, 52 insertions(+), 48 deletions(-) (limited to 'crates/ra_assists') diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs index 98e5112df..eb5112343 100644 --- a/crates/ra_assists/src/handlers/inline_local_variable.rs +++ b/crates/ra_assists/src/handlers/inline_local_variable.rs @@ -126,7 +126,7 @@ mod tests { fn test_inline_let_bind_literal_expr() { check_assist( inline_local_variable, - " + r" fn bar(a: usize) {} fn foo() { let a<|> = 1; @@ -140,7 +140,7 @@ fn foo() { let b = a * 10; bar(a); }", - " + r" fn bar(a: usize) {} fn foo() { <|>1 + 1; @@ -160,7 +160,7 @@ fn foo() { fn test_inline_let_bind_bin_expr() { check_assist( inline_local_variable, - " + r" fn bar(a: usize) {} fn foo() { let a<|> = 1 + 1; @@ -174,7 +174,7 @@ fn foo() { let b = a * 10; bar(a); }", - " + r" fn bar(a: usize) {} fn foo() { <|>(1 + 1) + 1; @@ -194,7 +194,7 @@ fn foo() { fn test_inline_let_bind_function_call_expr() { check_assist( inline_local_variable, - " + r" fn bar(a: usize) {} fn foo() { let a<|> = bar(1); @@ -208,7 +208,7 @@ fn foo() { let b = a * 10; bar(a); }", - " + r" fn bar(a: usize) {} fn foo() { <|>bar(1) + 1; @@ -228,7 +228,7 @@ fn foo() { fn test_inline_let_bind_cast_expr() { check_assist( inline_local_variable, - " + r" fn bar(a: usize): usize { a } fn foo() { let a<|> = bar(1) as u64; @@ -242,7 +242,7 @@ fn foo() { let b = a * 10; bar(a); }", - " + r" fn bar(a: usize): usize { a } fn foo() { <|>(bar(1) as u64) + 1; @@ -262,7 +262,7 @@ fn foo() { fn test_inline_let_bind_block_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = { 10 + 1 }; a + 1; @@ -275,7 +275,7 @@ fn foo() { let b = a * 10; bar(a); }", - " + r" fn foo() { <|>{ 10 + 1 } + 1; if { 10 + 1 } > 10 { @@ -294,7 +294,7 @@ fn foo() { fn test_inline_let_bind_paren_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = ( 10 + 1 ); a + 1; @@ -307,7 +307,7 @@ fn foo() { let b = a * 10; bar(a); }", - " + r" fn foo() { <|>( 10 + 1 ) + 1; if ( 10 + 1 ) > 10 { @@ -339,13 +339,13 @@ fn foo() { fn test_call_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = bar(10 + 1); let b = a * 10; let c = a as usize; }", - " + r" fn foo() { <|>let b = bar(10 + 1) * 10; let c = bar(10 + 1) as usize; @@ -357,14 +357,14 @@ fn foo() { fn test_index_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let x = vec![1, 2, 3]; let a<|> = x[0]; let b = a * 10; let c = a as usize; }", - " + r" fn foo() { let x = vec![1, 2, 3]; <|>let b = x[0] * 10; @@ -377,14 +377,14 @@ fn foo() { fn test_method_call_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let bar = vec![1]; let a<|> = bar.len(); let b = a * 10; let c = a as usize; }", - " + r" fn foo() { let bar = vec![1]; <|>let b = bar.len() * 10; @@ -397,7 +397,7 @@ fn foo() { fn test_field_expr() { check_assist( inline_local_variable, - " + r" struct Bar { foo: usize } @@ -408,7 +408,7 @@ fn foo() { let b = a * 10; let c = a as usize; }", - " + r" struct Bar { foo: usize } @@ -425,7 +425,7 @@ fn foo() { fn test_try_expr() { check_assist( inline_local_variable, - " + r" fn foo() -> Option { let bar = Some(1); let a<|> = bar?; @@ -433,7 +433,7 @@ fn foo() -> Option { let c = a as usize; None }", - " + r" fn foo() -> Option { let bar = Some(1); <|>let b = bar? * 10; @@ -447,13 +447,13 @@ fn foo() -> Option { fn test_ref_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let bar = 10; let a<|> = &bar; let b = a * 10; }", - " + r" fn foo() { let bar = 10; <|>let b = &bar * 10; @@ -465,12 +465,12 @@ fn foo() { fn test_tuple_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = (10, 20); let b = a[0]; }", - " + r" fn foo() { <|>let b = (10, 20)[0]; }", @@ -481,12 +481,12 @@ fn foo() { fn test_array_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = [1, 2, 3]; let b = a.len(); }", - " + r" fn foo() { <|>let b = [1, 2, 3].len(); }", @@ -497,13 +497,13 @@ fn foo() { fn test_paren() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = (10 + 20); let b = a * 10; let c = a as usize; }", - " + r" fn foo() { <|>let b = (10 + 20) * 10; let c = (10 + 20) as usize; @@ -515,14 +515,14 @@ fn foo() { fn test_path_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let d = 10; let a<|> = d; let b = a * 10; let c = a as usize; }", - " + r" fn foo() { let d = 10; <|>let b = d * 10; @@ -535,13 +535,13 @@ fn foo() { fn test_block_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = { 10 }; let b = a * 10; let c = a as usize; }", - " + r" fn foo() { <|>let b = { 10 } * 10; let c = { 10 } as usize; @@ -553,7 +553,7 @@ fn foo() { fn test_used_in_different_expr1() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = 10 + 20; let b = a * 10; @@ -561,7 +561,7 @@ fn foo() { let d = [a, 10]; let e = (a); }", - " + r" fn foo() { <|>let b = (10 + 20) * 10; let c = (10 + 20, 20); @@ -575,12 +575,12 @@ fn foo() { fn test_used_in_for_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = vec![10, 20]; for i in a {} }", - " + r" fn foo() { <|>for i in vec![10, 20] {} }", @@ -591,12 +591,12 @@ fn foo() { fn test_used_in_while_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = 1 > 0; while a {} }", - " + r" fn foo() { <|>while 1 > 0 {} }", @@ -607,14 +607,14 @@ fn foo() { fn test_used_in_break_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = 1 + 1; loop { break a; } }", - " + r" fn foo() { <|>loop { break 1 + 1; @@ -627,12 +627,12 @@ fn foo() { fn test_used_in_return_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = 1 > 0; return a; }", - " + r" fn foo() { <|>return 1 > 0; }", @@ -643,12 +643,12 @@ fn foo() { fn test_used_in_match_expr() { check_assist( inline_local_variable, - " + r" fn foo() { let a<|> = 1 > 0; match a {} }", - " + r" fn foo() { <|>match 1 > 0 {} }", diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index 6d81a6396..50a15f978 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs @@ -178,8 +178,12 @@ mod helpers { (db, file_id) } - pub(crate) fn check_assist(assist: AssistHandler, ra_fixture: &str, after: &str) { - check(assist, ra_fixture, ExpectedResult::After(after)); + pub(crate) fn check_assist( + 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 -- cgit v1.2.3