diff options
author | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
---|---|---|
committer | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
commit | 18a5e164838e1dc2abcc6b79d4fc2f96ffd2507c (patch) | |
tree | bc80b5c49c3b7ba31c7fe967bb34fe14bac9d5ed /crates/ra_ide/src/call_info.rs | |
parent | ab864ed259c10ff51f7c9c3421d098eeea7b0245 (diff) | |
parent | 33c364b545350134b945fbca834194fd1a28fe08 (diff) |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_ide/src/call_info.rs')
-rw-r--r-- | crates/ra_ide/src/call_info.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs index 39d09a07f..ca57eceff 100644 --- a/crates/ra_ide/src/call_info.rs +++ b/crates/ra_ide/src/call_info.rs | |||
@@ -109,7 +109,7 @@ impl FnCallNode { | |||
109 | syntax.ancestors().find_map(|node| { | 109 | syntax.ancestors().find_map(|node| { |
110 | match_ast! { | 110 | match_ast! { |
111 | match node { | 111 | match node { |
112 | ast::CallExpr(it) => { Some(FnCallNode::CallExpr(it)) }, | 112 | ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)), |
113 | ast::MethodCallExpr(it) => { | 113 | ast::MethodCallExpr(it) => { |
114 | let arg_list = it.arg_list()?; | 114 | let arg_list = it.arg_list()?; |
115 | if !syntax.text_range().is_subrange(&arg_list.syntax().text_range()) { | 115 | if !syntax.text_range().is_subrange(&arg_list.syntax().text_range()) { |
@@ -117,8 +117,8 @@ impl FnCallNode { | |||
117 | } | 117 | } |
118 | Some(FnCallNode::MethodCallExpr(it)) | 118 | Some(FnCallNode::MethodCallExpr(it)) |
119 | }, | 119 | }, |
120 | ast::MacroCall(it) => { Some(FnCallNode::MacroCallExpr(it)) }, | 120 | ast::MacroCall(it) => Some(FnCallNode::MacroCallExpr(it)), |
121 | _ => { None }, | 121 | _ => None, |
122 | } | 122 | } |
123 | } | 123 | } |
124 | }) | 124 | }) |
@@ -127,10 +127,10 @@ impl FnCallNode { | |||
127 | pub(crate) fn with_node_exact(node: &SyntaxNode) -> Option<FnCallNode> { | 127 | pub(crate) fn with_node_exact(node: &SyntaxNode) -> Option<FnCallNode> { |
128 | match_ast! { | 128 | match_ast! { |
129 | match node { | 129 | match node { |
130 | ast::CallExpr(it) => { Some(FnCallNode::CallExpr(it)) }, | 130 | ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)), |
131 | ast::MethodCallExpr(it) => { Some(FnCallNode::MethodCallExpr(it)) }, | 131 | ast::MethodCallExpr(it) => Some(FnCallNode::MethodCallExpr(it)), |
132 | ast::MacroCall(it) => { Some(FnCallNode::MacroCallExpr(it)) }, | 132 | ast::MacroCall(it) => Some(FnCallNode::MacroCallExpr(it)), |
133 | _ => { None }, | 133 | _ => None, |
134 | } | 134 | } |
135 | } | 135 | } |
136 | } | 136 | } |