diff options
Diffstat (limited to 'crates/assists/src/handlers/unwrap_block.rs')
| -rw-r--r-- | crates/assists/src/handlers/unwrap_block.rs | 613 |
1 files changed, 339 insertions, 274 deletions
diff --git a/crates/assists/src/handlers/unwrap_block.rs b/crates/assists/src/handlers/unwrap_block.rs index 36ef871b9..676db7137 100644 --- a/crates/assists/src/handlers/unwrap_block.rs +++ b/crates/assists/src/handlers/unwrap_block.rs | |||
| @@ -3,7 +3,7 @@ use syntax::{ | |||
| 3 | self, | 3 | self, |
| 4 | edit::{AstNodeEdit, IndentLevel}, | 4 | edit::{AstNodeEdit, IndentLevel}, |
| 5 | }, | 5 | }, |
| 6 | AstNode, TextRange, T, | 6 | AstNode, SyntaxKind, TextRange, T, |
| 7 | }; | 7 | }; |
| 8 | 8 | ||
| 9 | use crate::{utils::unwrap_trivial_block, AssistContext, AssistId, AssistKind, Assists}; | 9 | use crate::{utils::unwrap_trivial_block, AssistContext, AssistId, AssistKind, Assists}; |
| @@ -31,11 +31,21 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()> | |||
| 31 | 31 | ||
| 32 | let l_curly_token = ctx.find_token_syntax_at_offset(T!['{'])?; | 32 | let l_curly_token = ctx.find_token_syntax_at_offset(T!['{'])?; |
| 33 | let mut block = ast::BlockExpr::cast(l_curly_token.parent())?; | 33 | let mut block = ast::BlockExpr::cast(l_curly_token.parent())?; |
| 34 | let target = block.syntax().text_range(); | ||
| 34 | let mut parent = block.syntax().parent()?; | 35 | let mut parent = block.syntax().parent()?; |
| 35 | if ast::MatchArm::can_cast(parent.kind()) { | 36 | if ast::MatchArm::can_cast(parent.kind()) { |
| 36 | parent = parent.ancestors().find(|it| ast::MatchExpr::can_cast(it.kind()))? | 37 | parent = parent.ancestors().find(|it| ast::MatchExpr::can_cast(it.kind()))? |
| 37 | } | 38 | } |
| 38 | 39 | ||
| 40 | if matches!(parent.kind(), SyntaxKind::BLOCK_EXPR | SyntaxKind::EXPR_STMT) { | ||
| 41 | return acc.add(assist_id, assist_label, target, |builder| { | ||
| 42 | builder.replace( | ||
| 43 | block.syntax().text_range(), | ||
| 44 | update_expr_string(block.to_string(), &[' ', '{', '\n']), | ||
| 45 | ); | ||
| 46 | }); | ||
| 47 | } | ||
| 48 | |||
| 39 | let parent = ast::Expr::cast(parent)?; | 49 | let parent = ast::Expr::cast(parent)?; |
| 40 | 50 | ||
| 41 | match parent.clone() { | 51 | match parent.clone() { |
| @@ -48,7 +58,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()> | |||
| 48 | // For `else if` blocks | 58 | // For `else if` blocks |
| 49 | let ancestor_then_branch = ancestor.then_branch()?; | 59 | let ancestor_then_branch = ancestor.then_branch()?; |
| 50 | 60 | ||
| 51 | let target = then_branch.syntax().text_range(); | ||
| 52 | return acc.add(assist_id, assist_label, target, |edit| { | 61 | return acc.add(assist_id, assist_label, target, |edit| { |
| 53 | let range_to_del_else_if = TextRange::new( | 62 | let range_to_del_else_if = TextRange::new( |
| 54 | ancestor_then_branch.syntax().text_range().end(), | 63 | ancestor_then_branch.syntax().text_range().end(), |
| @@ -68,7 +77,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()> | |||
| 68 | }); | 77 | }); |
| 69 | } | 78 | } |
| 70 | } else { | 79 | } else { |
| 71 | let target = block.syntax().text_range(); | ||
| 72 | return acc.add(assist_id, assist_label, target, |edit| { | 80 | return acc.add(assist_id, assist_label, target, |edit| { |
| 73 | let range_to_del = TextRange::new( | 81 | let range_to_del = TextRange::new( |
| 74 | then_branch.syntax().text_range().end(), | 82 | then_branch.syntax().text_range().end(), |
| @@ -84,7 +92,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()> | |||
| 84 | }; | 92 | }; |
| 85 | 93 | ||
| 86 | let unwrapped = unwrap_trivial_block(block); | 94 | let unwrapped = unwrap_trivial_block(block); |
| 87 | let target = unwrapped.syntax().text_range(); | ||
| 88 | acc.add(assist_id, assist_label, target, |builder| { | 95 | acc.add(assist_id, assist_label, target, |builder| { |
| 89 | builder.replace( | 96 | builder.replace( |
| 90 | parent.syntax().text_range(), | 97 | parent.syntax().text_range(), |
| @@ -112,31 +119,89 @@ mod tests { | |||
| 112 | use super::*; | 119 | use super::*; |
| 113 | 120 | ||
| 114 | #[test] | 121 | #[test] |
| 122 | fn unwrap_tail_expr_block() { | ||
| 123 | check_assist( | ||
| 124 | unwrap_block, | ||
| 125 | r#" | ||
| 126 | fn main() { | ||
| 127 | <|>{ | ||
| 128 | 92 | ||
| 129 | } | ||
| 130 | } | ||
| 131 | "#, | ||
| 132 | r#" | ||
| 133 | fn main() { | ||
| 134 | 92 | ||
| 135 | } | ||
| 136 | "#, | ||
| 137 | ) | ||
| 138 | } | ||
| 139 | |||
| 140 | #[test] | ||
| 141 | fn unwrap_stmt_expr_block() { | ||
| 142 | check_assist( | ||
| 143 | unwrap_block, | ||
| 144 | r#" | ||
| 145 | fn main() { | ||
| 146 | <|>{ | ||
| 147 | 92; | ||
| 148 | } | ||
| 149 | () | ||
| 150 | } | ||
| 151 | "#, | ||
| 152 | r#" | ||
| 153 | fn main() { | ||
| 154 | 92; | ||
| 155 | () | ||
| 156 | } | ||
| 157 | "#, | ||
| 158 | ); | ||
| 159 | // Pedantically, we should add an `;` here... | ||
| 160 | check_assist( | ||
| 161 | unwrap_block, | ||
| 162 | r#" | ||
| 163 | fn main() { | ||
| 164 | <|>{ | ||
| 165 | 92 | ||
| 166 | } | ||
| 167 | () | ||
| 168 | } | ||
| 169 | "#, | ||
| 170 | r#" | ||
| 171 | fn main() { | ||
| 172 | 92 | ||
| 173 | () | ||
| 174 | } | ||
| 175 | "#, | ||
| 176 | ); | ||
| 177 | } | ||
| 178 | |||
| 179 | #[test] | ||
| 115 | fn simple_if() { | 180 | fn simple_if() { |
| 116 | check_assist( | 181 | check_assist( |
| 117 | unwrap_block, | 182 | unwrap_block, |
| 118 | r#" | 183 | r#" |
| 119 | fn main() { | 184 | fn main() { |
| 120 | bar(); | 185 | bar(); |
| 121 | if true {<|> | 186 | if true {<|> |
| 122 | foo(); | 187 | foo(); |
| 123 | 188 | ||
| 124 | //comment | 189 | //comment |
| 125 | bar(); | 190 | bar(); |
| 126 | } else { | 191 | } else { |
| 127 | println!("bar"); | 192 | println!("bar"); |
| 128 | } | 193 | } |
| 129 | } | 194 | } |
| 130 | "#, | 195 | "#, |
| 131 | r#" | 196 | r#" |
| 132 | fn main() { | 197 | fn main() { |
| 133 | bar(); | 198 | bar(); |
| 134 | foo(); | 199 | foo(); |
| 135 | 200 | ||
| 136 | //comment | 201 | //comment |
| 137 | bar(); | 202 | bar(); |
| 138 | } | 203 | } |
| 139 | "#, | 204 | "#, |
| 140 | ); | 205 | ); |
| 141 | } | 206 | } |
| 142 | 207 | ||
| @@ -145,30 +210,30 @@ mod tests { | |||
| 145 | check_assist( | 210 | check_assist( |
| 146 | unwrap_block, | 211 | unwrap_block, |
| 147 | r#" | 212 | r#" |
| 148 | fn main() { | 213 | fn main() { |
| 149 | bar(); | 214 | bar(); |
| 150 | if true { | 215 | if true { |
| 151 | foo(); | 216 | foo(); |
| 152 | 217 | ||
| 153 | //comment | 218 | //comment |
| 154 | bar(); | 219 | bar(); |
| 155 | } else {<|> | 220 | } else {<|> |
| 156 | println!("bar"); | 221 | println!("bar"); |
| 157 | } | 222 | } |
| 158 | } | 223 | } |
| 159 | "#, | 224 | "#, |
| 160 | r#" | 225 | r#" |
| 161 | fn main() { | 226 | fn main() { |
| 162 | bar(); | 227 | bar(); |
| 163 | if true { | 228 | if true { |
| 164 | foo(); | 229 | foo(); |
| 165 | 230 | ||
| 166 | //comment | 231 | //comment |
| 167 | bar(); | 232 | bar(); |
| 168 | } | 233 | } |
| 169 | println!("bar"); | 234 | println!("bar"); |
| 170 | } | 235 | } |
| 171 | "#, | 236 | "#, |
| 172 | ); | 237 | ); |
| 173 | } | 238 | } |
| 174 | 239 | ||
| @@ -177,32 +242,32 @@ mod tests { | |||
| 177 | check_assist( | 242 | check_assist( |
| 178 | unwrap_block, | 243 | unwrap_block, |
| 179 | r#" | 244 | r#" |
| 180 | fn main() { | 245 | fn main() { |
| 181 | //bar(); | 246 | //bar(); |
| 182 | if true { | 247 | if true { |
| 183 | println!("true"); | 248 | println!("true"); |
| 184 | 249 | ||
| 185 | //comment | 250 | //comment |
| 186 | //bar(); | 251 | //bar(); |
| 187 | } else if false {<|> | 252 | } else if false {<|> |
| 188 | println!("bar"); | 253 | println!("bar"); |
| 189 | } else { | 254 | } else { |
| 190 | println!("foo"); | 255 | println!("foo"); |
| 191 | } | 256 | } |
| 192 | } | 257 | } |
| 193 | "#, | 258 | "#, |
| 194 | r#" | 259 | r#" |
| 195 | fn main() { | 260 | fn main() { |
| 196 | //bar(); | 261 | //bar(); |
| 197 | if true { | 262 | if true { |
| 198 | println!("true"); | 263 | println!("true"); |
| 199 | 264 | ||
| 200 | //comment | 265 | //comment |
| 201 | //bar(); | 266 | //bar(); |
| 202 | } | 267 | } |
| 203 | println!("bar"); | 268 | println!("bar"); |
| 204 | } | 269 | } |
| 205 | "#, | 270 | "#, |
| 206 | ); | 271 | ); |
| 207 | } | 272 | } |
| 208 | 273 | ||
| @@ -211,34 +276,34 @@ mod tests { | |||
| 211 | check_assist( | 276 | check_assist( |
| 212 | unwrap_block, | 277 | unwrap_block, |
| 213 | r#" | 278 | r#" |
| 214 | fn main() { | 279 | fn main() { |
| 215 | //bar(); | 280 | //bar(); |
| 216 | if true { | 281 | if true { |
| 217 | println!("true"); | 282 | println!("true"); |
| 218 | 283 | ||
| 219 | //comment | 284 | //comment |
| 220 | //bar(); | 285 | //bar(); |
| 221 | } else if false { | 286 | } else if false { |
| 222 | println!("bar"); | 287 | println!("bar"); |
| 223 | } else if true {<|> | 288 | } else if true {<|> |
| 224 | println!("foo"); | 289 | println!("foo"); |
| 225 | } | 290 | } |
| 226 | } | 291 | } |
| 227 | "#, | 292 | "#, |
| 228 | r#" | 293 | r#" |
| 229 | fn main() { | 294 | fn main() { |
| 230 | //bar(); | 295 | //bar(); |
| 231 | if true { | 296 | if true { |
| 232 | println!("true"); | 297 | println!("true"); |
| 233 | 298 | ||
| 234 | //comment | 299 | //comment |
| 235 | //bar(); | 300 | //bar(); |
| 236 | } else if false { | 301 | } else if false { |
| 237 | println!("bar"); | 302 | println!("bar"); |
| 238 | } | 303 | } |
| 239 | println!("foo"); | 304 | println!("foo"); |
| 240 | } | 305 | } |
| 241 | "#, | 306 | "#, |
| 242 | ); | 307 | ); |
| 243 | } | 308 | } |
| 244 | 309 | ||
| @@ -247,38 +312,38 @@ mod tests { | |||
| 247 | check_assist( | 312 | check_assist( |
| 248 | unwrap_block, | 313 | unwrap_block, |
| 249 | r#" | 314 | r#" |
| 250 | fn main() { | 315 | fn main() { |
| 251 | //bar(); | 316 | //bar(); |
| 252 | if true { | 317 | if true { |
| 253 | println!("true"); | 318 | println!("true"); |
| 254 | 319 | ||
| 255 | //comment | 320 | //comment |
| 256 | //bar(); | 321 | //bar(); |
| 257 | } else if false { | 322 | } else if false { |
| 258 | println!("bar"); | 323 | println!("bar"); |
| 259 | } else if true { | 324 | } else if true { |
| 260 | println!("foo"); | 325 | println!("foo"); |
| 261 | } else {<|> | 326 | } else {<|> |
| 262 | println!("else"); | 327 | println!("else"); |
| 263 | } | 328 | } |
| 264 | } | 329 | } |
| 265 | "#, | 330 | "#, |
| 266 | r#" | 331 | r#" |
| 267 | fn main() { | 332 | fn main() { |
| 268 | //bar(); | 333 | //bar(); |
| 269 | if true { | 334 | if true { |
| 270 | println!("true"); | 335 | println!("true"); |
| 271 | 336 | ||
| 272 | //comment | 337 | //comment |
| 273 | //bar(); | 338 | //bar(); |
| 274 | } else if false { | 339 | } else if false { |
| 275 | println!("bar"); | 340 | println!("bar"); |
| 276 | } else if true { | 341 | } else if true { |
| 277 | println!("foo"); | 342 | println!("foo"); |
| 278 | } | 343 | } |
| 279 | println!("else"); | 344 | println!("else"); |
| 280 | } | 345 | } |
| 281 | "#, | 346 | "#, |
| 282 | ); | 347 | ); |
| 283 | } | 348 | } |
| 284 | 349 | ||
| @@ -287,36 +352,36 @@ mod tests { | |||
| 287 | check_assist( | 352 | check_assist( |
| 288 | unwrap_block, | 353 | unwrap_block, |
| 289 | r#" | 354 | r#" |
| 290 | fn main() { | 355 | fn main() { |
| 291 | //bar(); | 356 | //bar(); |
| 292 | if true { | 357 | if true { |
| 293 | println!("true"); | 358 | println!("true"); |
| 294 | 359 | ||
| 295 | //comment | 360 | //comment |
| 296 | //bar(); | 361 | //bar(); |
| 297 | } else if false { | 362 | } else if false { |
| 298 | println!("bar"); | 363 | println!("bar"); |
| 299 | } else if true {<|> | 364 | } else if true {<|> |
| 300 | println!("foo"); | 365 | println!("foo"); |
| 301 | } else { | 366 | } else { |
| 302 | println!("else"); | 367 | println!("else"); |
| 303 | } | 368 | } |
| 304 | } | 369 | } |
| 305 | "#, | 370 | "#, |
| 306 | r#" | 371 | r#" |
| 307 | fn main() { | 372 | fn main() { |
| 308 | //bar(); | 373 | //bar(); |
| 309 | if true { | 374 | if true { |
| 310 | println!("true"); | 375 | println!("true"); |
| 311 | 376 | ||
| 312 | //comment | 377 | //comment |
| 313 | //bar(); | 378 | //bar(); |
| 314 | } else if false { | 379 | } else if false { |
| 315 | println!("bar"); | 380 | println!("bar"); |
| 316 | } | 381 | } |
| 317 | println!("foo"); | 382 | println!("foo"); |
| 318 | } | 383 | } |
| 319 | "#, | 384 | "#, |
| 320 | ); | 385 | ); |
| 321 | } | 386 | } |
| 322 | 387 | ||
| @@ -325,18 +390,18 @@ mod tests { | |||
| 325 | check_assist_not_applicable( | 390 | check_assist_not_applicable( |
| 326 | unwrap_block, | 391 | unwrap_block, |
| 327 | r#" | 392 | r#" |
| 328 | fn main() { | 393 | fn main() { |
| 329 | bar();<|> | 394 | bar();<|> |
| 330 | if true { | 395 | if true { |
| 331 | foo(); | 396 | foo(); |
| 332 | 397 | ||
| 333 | //comment | 398 | //comment |
| 334 | bar(); | 399 | bar(); |
| 335 | } else { | 400 | } else { |
| 336 | println!("bar"); | 401 | println!("bar"); |
| 337 | } | 402 | } |
| 338 | } | 403 | } |
| 339 | "#, | 404 | "#, |
| 340 | ); | 405 | ); |
| 341 | } | 406 | } |
| 342 | 407 | ||
| @@ -345,31 +410,31 @@ mod tests { | |||
| 345 | check_assist( | 410 | check_assist( |
| 346 | unwrap_block, | 411 | unwrap_block, |
| 347 | r#" | 412 | r#" |
| 348 | fn main() { | 413 | fn main() { |
| 349 | for i in 0..5 {<|> | 414 | for i in 0..5 {<|> |
| 350 | if true { | 415 | if true { |
| 351 | foo(); | 416 | foo(); |
| 352 | 417 | ||
| 353 | //comment | 418 | //comment |
| 354 | bar(); | 419 | bar(); |
| 355 | } else { | 420 | } else { |
| 356 | println!("bar"); | 421 | println!("bar"); |
| 357 | } | 422 | } |
| 358 | } | 423 | } |
| 359 | } | 424 | } |
| 360 | "#, | 425 | "#, |
| 361 | r#" | 426 | r#" |
| 362 | fn main() { | 427 | fn main() { |
| 363 | if true { | 428 | if true { |
| 364 | foo(); | 429 | foo(); |
| 365 | 430 | ||
| 366 | //comment | 431 | //comment |
| 367 | bar(); | 432 | bar(); |
| 368 | } else { | 433 | } else { |
| 369 | println!("bar"); | 434 | println!("bar"); |
| 370 | } | 435 | } |
| 371 | } | 436 | } |
| 372 | "#, | 437 | "#, |
| 373 | ); | 438 | ); |
| 374 | } | 439 | } |
| 375 | 440 | ||
| @@ -378,29 +443,29 @@ mod tests { | |||
| 378 | check_assist( | 443 | check_assist( |
| 379 | unwrap_block, | 444 | unwrap_block, |
| 380 | r#" | 445 | r#" |
| 381 | fn main() { | 446 | fn main() { |
| 382 | for i in 0..5 { | 447 | for i in 0..5 { |
| 383 | if true {<|> | 448 | if true {<|> |
| 384 | foo(); | 449 | foo(); |
| 385 | 450 | ||
| 386 | //comment | 451 | //comment |
| 387 | bar(); | 452 | bar(); |
| 388 | } else { | 453 | } else { |
| 389 | println!("bar"); | 454 | println!("bar"); |
| 390 | } | 455 | } |
| 391 | } | 456 | } |
| 392 | } | 457 | } |
| 393 | "#, | 458 | "#, |
| 394 | r#" | 459 | r#" |
| 395 | fn main() { | 460 | fn main() { |
| 396 | for i in 0..5 { | 461 | for i in 0..5 { |
| 397 | foo(); | 462 | foo(); |
| 398 | 463 | ||
| 399 | //comment | 464 | //comment |
| 400 | bar(); | 465 | bar(); |
| 401 | } | 466 | } |
| 402 | } | 467 | } |
| 403 | "#, | 468 | "#, |
| 404 | ); | 469 | ); |
| 405 | } | 470 | } |
| 406 | 471 | ||
| @@ -409,31 +474,31 @@ mod tests { | |||
| 409 | check_assist( | 474 | check_assist( |
| 410 | unwrap_block, | 475 | unwrap_block, |
| 411 | r#" | 476 | r#" |
| 412 | fn main() { | 477 | fn main() { |
| 413 | loop {<|> | 478 | loop {<|> |
| 414 | if true { | 479 | if true { |
| 415 | foo(); | 480 | foo(); |
| 416 | 481 | ||
| 417 | //comment | 482 | //comment |
| 418 | bar(); | 483 | bar(); |
| 419 | } else { | 484 | } else { |
| 420 | println!("bar"); | 485 | println!("bar"); |
| 421 | } | 486 | } |
| 422 | } | 487 | } |
| 423 | } | 488 | } |
| 424 | "#, | 489 | "#, |
| 425 | r#" | 490 | r#" |
| 426 | fn main() { | 491 | fn main() { |
| 427 | if true { | 492 | if true { |
| 428 | foo(); | 493 | foo(); |
| 429 | 494 | ||
| 430 | //comment | 495 | //comment |
| 431 | bar(); | 496 | bar(); |
| 432 | } else { | 497 | } else { |
| 433 | println!("bar"); | 498 | println!("bar"); |
| 434 | } | 499 | } |
| 435 | } | 500 | } |
| 436 | "#, | 501 | "#, |
| 437 | ); | 502 | ); |
| 438 | } | 503 | } |
| 439 | 504 | ||
| @@ -442,31 +507,31 @@ mod tests { | |||
| 442 | check_assist( | 507 | check_assist( |
| 443 | unwrap_block, | 508 | unwrap_block, |
| 444 | r#" | 509 | r#" |
| 445 | fn main() { | 510 | fn main() { |
| 446 | while true {<|> | 511 | while true {<|> |
| 447 | if true { | 512 | if true { |
| 448 | foo(); | 513 | foo(); |
| 449 | 514 | ||
| 450 | //comment | 515 | //comment |
| 451 | bar(); | 516 | bar(); |
| 452 | } else { | 517 | } else { |
| 453 | println!("bar"); | 518 | println!("bar"); |
| 454 | } | 519 | } |
| 455 | } | 520 | } |
| 456 | } | 521 | } |
| 457 | "#, | 522 | "#, |
| 458 | r#" | 523 | r#" |
| 459 | fn main() { | 524 | fn main() { |
| 460 | if true { | 525 | if true { |
| 461 | foo(); | 526 | foo(); |
| 462 | 527 | ||
| 463 | //comment | 528 | //comment |
| 464 | bar(); | 529 | bar(); |
| 465 | } else { | 530 | } else { |
| 466 | println!("bar"); | 531 | println!("bar"); |
| 467 | } | 532 | } |
| 468 | } | 533 | } |
| 469 | "#, | 534 | "#, |
| 470 | ); | 535 | ); |
| 471 | } | 536 | } |
| 472 | 537 | ||
| @@ -499,19 +564,19 @@ fn main() { | |||
| 499 | check_assist_not_applicable( | 564 | check_assist_not_applicable( |
| 500 | unwrap_block, | 565 | unwrap_block, |
| 501 | r#" | 566 | r#" |
| 502 | fn main() { | 567 | fn main() { |
| 503 | while true { | 568 | while true { |
| 504 | if true { | 569 | if true { |
| 505 | foo();<|> | 570 | foo();<|> |
| 506 | 571 | ||
| 507 | //comment | 572 | //comment |
| 508 | bar(); | 573 | bar(); |
| 509 | } else { | 574 | } else { |
| 510 | println!("bar"); | 575 | println!("bar"); |
| 511 | } | 576 | } |
| 512 | } | 577 | } |
| 513 | } | 578 | } |
| 514 | "#, | 579 | "#, |
| 515 | ); | 580 | ); |
| 516 | } | 581 | } |
| 517 | } | 582 | } |