diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-19 12:15:55 +0100 |
|---|---|---|
| committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-19 12:15:55 +0100 |
| commit | f209843e31af7f0e0212aa28ffec2efad2a70c6f (patch) | |
| tree | 548227da78a3bea644f57714d075410c0bdf7469 /crates/ra_assists/src/remove_dbg.rs | |
| parent | 58d4983ba5745975446d60f2886d96f8d2adf0f2 (diff) | |
| parent | d4a66166c002f0a49e41d856a49cb5685ac93202 (diff) | |
Merge #1545
1545: migrate ra_syntax to the new rowan API r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Diffstat (limited to 'crates/ra_assists/src/remove_dbg.rs')
| -rw-r--r-- | crates/ra_assists/src/remove_dbg.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_assists/src/remove_dbg.rs b/crates/ra_assists/src/remove_dbg.rs index 5680f76ca..c330bc827 100644 --- a/crates/ra_assists/src/remove_dbg.rs +++ b/crates/ra_assists/src/remove_dbg.rs | |||
| @@ -8,7 +8,7 @@ use ra_syntax::{ | |||
| 8 | pub(crate) fn remove_dbg(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> { | 8 | pub(crate) fn remove_dbg(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> { |
| 9 | let macro_call = ctx.node_at_offset::<ast::MacroCall>()?; | 9 | let macro_call = ctx.node_at_offset::<ast::MacroCall>()?; |
| 10 | 10 | ||
| 11 | if !is_valid_macrocall(macro_call, "dbg")? { | 11 | if !is_valid_macrocall(¯o_call, "dbg")? { |
| 12 | return None; | 12 | return None; |
| 13 | } | 13 | } |
| 14 | 14 | ||
| @@ -35,7 +35,7 @@ pub(crate) fn remove_dbg(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> | |||
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | let macro_content = { | 37 | let macro_content = { |
| 38 | let macro_args = macro_call.token_tree()?.syntax(); | 38 | let macro_args = macro_call.token_tree()?.syntax().clone(); |
| 39 | let range = macro_args.range(); | 39 | let range = macro_args.range(); |
| 40 | let start = range.start() + TextUnit::of_char('('); | 40 | let start = range.start() + TextUnit::of_char('('); |
| 41 | let end = range.end() - TextUnit::of_char(')'); | 41 | let end = range.end() - TextUnit::of_char(')'); |
| @@ -65,7 +65,7 @@ fn is_valid_macrocall(macro_call: &ast::MacroCall, macro_name: &str) -> Option<b | |||
| 65 | return None; | 65 | return None; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | let node = macro_call.token_tree()?.syntax(); | 68 | let node = macro_call.token_tree()?.syntax().clone(); |
| 69 | let first_child = node.first_child_or_token()?; | 69 | let first_child = node.first_child_or_token()?; |
| 70 | let last_child = node.last_child_or_token()?; | 70 | let last_child = node.last_child_or_token()?; |
| 71 | 71 | ||