From f345d1772ab3827fbc3e31428b0d9479cab0ea39 Mon Sep 17 00:00:00 2001 From: Vladyslav Katasonov Date: Wed, 10 Feb 2021 05:50:03 +0300 Subject: handle return, break and continue when extracting function --- crates/assists/src/tests.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'crates/assists/src/tests.rs') diff --git a/crates/assists/src/tests.rs b/crates/assists/src/tests.rs index 5b9992f15..720f561a1 100644 --- a/crates/assists/src/tests.rs +++ b/crates/assists/src/tests.rs @@ -195,6 +195,7 @@ fn assist_order_if_expr() { let assists = Assist::get(&db, &TEST_CONFIG, false, frange); let mut assists = assists.iter(); + assert_eq!(assists.next().expect("expected assist").label, "Extract into function"); assert_eq!(assists.next().expect("expected assist").label, "Extract into variable"); assert_eq!(assists.next().expect("expected assist").label, "Replace with match"); } @@ -220,6 +221,7 @@ fn assist_filter_works() { let assists = Assist::get(&db, &cfg, false, frange); let mut assists = assists.iter(); + assert_eq!(assists.next().expect("expected assist").label, "Extract into function"); assert_eq!(assists.next().expect("expected assist").label, "Extract into variable"); assert_eq!(assists.next().expect("expected assist").label, "Replace with match"); } @@ -228,9 +230,10 @@ fn assist_filter_works() { let mut cfg = TEST_CONFIG; cfg.allowed = Some(vec![AssistKind::RefactorExtract]); let assists = Assist::get(&db, &cfg, false, frange); - assert_eq!(assists.len(), 1); + assert_eq!(assists.len(), 2); let mut assists = assists.iter(); + assert_eq!(assists.next().expect("expected assist").label, "Extract into function"); assert_eq!(assists.next().expect("expected assist").label, "Extract into variable"); } -- cgit v1.2.3