aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_assists/src/inline_local_variable.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-08-19 12:11:09 +0100
committerAleksey Kladov <[email protected]>2019-08-19 12:11:09 +0100
commit3bec812258d4b795c9daf4bda4c16508e927ea53 (patch)
tree794d6dec1910191be7edf1a4fb2a87466d7e1984 /crates/ra_assists/src/inline_local_variable.rs
parentb50a04827c13af00314eb9869d3cc125b2419971 (diff)
remove ast::*Kind enums from assists
Diffstat (limited to 'crates/ra_assists/src/inline_local_variable.rs')
-rw-r--r--crates/ra_assists/src/inline_local_variable.rs50
1 files changed, 25 insertions, 25 deletions
diff --git a/crates/ra_assists/src/inline_local_variable.rs b/crates/ra_assists/src/inline_local_variable.rs
index 82c4d54b0..eedb29199 100644
--- a/crates/ra_assists/src/inline_local_variable.rs
+++ b/crates/ra_assists/src/inline_local_variable.rs
@@ -1,6 +1,6 @@
1use hir::db::HirDatabase; 1use hir::db::HirDatabase;
2use ra_syntax::{ 2use ra_syntax::{
3 ast::{self, AstNode, AstToken, ExprKind, PatKind}, 3 ast::{self, AstNode, AstToken},
4 TextRange, 4 TextRange,
5}; 5};
6 6
@@ -9,8 +9,8 @@ use crate::{Assist, AssistCtx, AssistId};
9 9
10pub(crate) fn inline_local_varialbe(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> { 10pub(crate) fn inline_local_varialbe(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
11 let let_stmt = ctx.node_at_offset::<ast::LetStmt>()?; 11 let let_stmt = ctx.node_at_offset::<ast::LetStmt>()?;
12 let bind_pat = match let_stmt.pat()?.kind() { 12 let bind_pat = match let_stmt.pat()? {
13 PatKind::BindPat(pat) => pat, 13 ast::Pat::BindPat(pat) => pat,
14 _ => return None, 14 _ => return None,
15 }; 15 };
16 if bind_pat.is_mutable() { 16 if bind_pat.is_mutable() {
@@ -48,28 +48,28 @@ pub(crate) fn inline_local_varialbe(mut ctx: AssistCtx<impl HirDatabase>) -> Opt
48 } 48 }
49 }; 49 };
50 50
51 wrap_in_parens[i] = match (initializer_expr.kind(), usage_parent.kind()) { 51 wrap_in_parens[i] = match (&initializer_expr, usage_parent) {
52 (ExprKind::CallExpr(_), _) 52 (ast::Expr::CallExpr(_), _)
53 | (ExprKind::IndexExpr(_), _) 53 | (ast::Expr::IndexExpr(_), _)
54 | (ExprKind::MethodCallExpr(_), _) 54 | (ast::Expr::MethodCallExpr(_), _)
55 | (ExprKind::FieldExpr(_), _) 55 | (ast::Expr::FieldExpr(_), _)
56 | (ExprKind::TryExpr(_), _) 56 | (ast::Expr::TryExpr(_), _)
57 | (ExprKind::RefExpr(_), _) 57 | (ast::Expr::RefExpr(_), _)
58 | (ExprKind::Literal(_), _) 58 | (ast::Expr::Literal(_), _)
59 | (ExprKind::TupleExpr(_), _) 59 | (ast::Expr::TupleExpr(_), _)
60 | (ExprKind::ArrayExpr(_), _) 60 | (ast::Expr::ArrayExpr(_), _)
61 | (ExprKind::ParenExpr(_), _) 61 | (ast::Expr::ParenExpr(_), _)
62 | (ExprKind::PathExpr(_), _) 62 | (ast::Expr::PathExpr(_), _)
63 | (ExprKind::BlockExpr(_), _) 63 | (ast::Expr::BlockExpr(_), _)
64 | (_, ExprKind::CallExpr(_)) 64 | (_, ast::Expr::CallExpr(_))
65 | (_, ExprKind::TupleExpr(_)) 65 | (_, ast::Expr::TupleExpr(_))
66 | (_, ExprKind::ArrayExpr(_)) 66 | (_, ast::Expr::ArrayExpr(_))
67 | (_, ExprKind::ParenExpr(_)) 67 | (_, ast::Expr::ParenExpr(_))
68 | (_, ExprKind::ForExpr(_)) 68 | (_, ast::Expr::ForExpr(_))
69 | (_, ExprKind::WhileExpr(_)) 69 | (_, ast::Expr::WhileExpr(_))
70 | (_, ExprKind::BreakExpr(_)) 70 | (_, ast::Expr::BreakExpr(_))
71 | (_, ExprKind::ReturnExpr(_)) 71 | (_, ast::Expr::ReturnExpr(_))
72 | (_, ExprKind::MatchExpr(_)) => false, 72 | (_, ast::Expr::MatchExpr(_)) => false,
73 _ => true, 73 _ => true,
74 }; 74 };
75 } 75 }