aboutsummaryrefslogtreecommitdiff
path: root/crates/ide_completion/src/patterns.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ide_completion/src/patterns.rs')
-rw-r--r--crates/ide_completion/src/patterns.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ide_completion/src/patterns.rs b/crates/ide_completion/src/patterns.rs
index 81d7a1a1d..72e67e3c4 100644
--- a/crates/ide_completion/src/patterns.rs
+++ b/crates/ide_completion/src/patterns.rs
@@ -115,12 +115,12 @@ pub(crate) fn determine_location(
115) -> Option<ImmediateLocation> { 115) -> Option<ImmediateLocation> {
116 let node = match name_like { 116 let node = match name_like {
117 ast::NameLike::NameRef(name_ref) => { 117 ast::NameLike::NameRef(name_ref) => {
118 if ast::RecordExprField::for_field_name(&name_ref).is_some() { 118 if ast::RecordExprField::for_field_name(name_ref).is_some() {
119 return sema 119 return sema
120 .find_node_at_offset_with_macros(original_file, offset) 120 .find_node_at_offset_with_macros(original_file, offset)
121 .map(ImmediateLocation::RecordExpr); 121 .map(ImmediateLocation::RecordExpr);
122 } 122 }
123 if ast::RecordPatField::for_field_name_ref(&name_ref).is_some() { 123 if ast::RecordPatField::for_field_name_ref(name_ref).is_some() {
124 return sema 124 return sema
125 .find_node_at_offset_with_macros(original_file, offset) 125 .find_node_at_offset_with_macros(original_file, offset)
126 .map(ImmediateLocation::RecordPat); 126 .map(ImmediateLocation::RecordPat);
@@ -128,7 +128,7 @@ pub(crate) fn determine_location(
128 maximize_name_ref(name_ref) 128 maximize_name_ref(name_ref)
129 } 129 }
130 ast::NameLike::Name(name) => { 130 ast::NameLike::Name(name) => {
131 if ast::RecordPatField::for_field_name(&name).is_some() { 131 if ast::RecordPatField::for_field_name(name).is_some() {
132 return sema 132 return sema
133 .find_node_at_offset_with_macros(original_file, offset) 133 .find_node_at_offset_with_macros(original_file, offset)
134 .map(ImmediateLocation::RecordPat); 134 .map(ImmediateLocation::RecordPat);
@@ -259,7 +259,7 @@ fn test_inside_impl_trait_block() {
259} 259}
260 260
261pub(crate) fn previous_token(element: SyntaxElement) -> Option<SyntaxToken> { 261pub(crate) fn previous_token(element: SyntaxElement) -> Option<SyntaxToken> {
262 element.into_token().and_then(|it| previous_non_trivia_token(it)) 262 element.into_token().and_then(previous_non_trivia_token)
263} 263}
264 264
265/// Check if the token previous to the previous one is `for`. 265/// Check if the token previous to the previous one is `for`.
@@ -267,8 +267,8 @@ pub(crate) fn previous_token(element: SyntaxElement) -> Option<SyntaxToken> {
267pub(crate) fn for_is_prev2(element: SyntaxElement) -> bool { 267pub(crate) fn for_is_prev2(element: SyntaxElement) -> bool {
268 element 268 element
269 .into_token() 269 .into_token()
270 .and_then(|it| previous_non_trivia_token(it)) 270 .and_then(previous_non_trivia_token)
271 .and_then(|it| previous_non_trivia_token(it)) 271 .and_then(previous_non_trivia_token)
272 .filter(|it| it.kind() == T![for]) 272 .filter(|it| it.kind() == T![for])
273 .is_some() 273 .is_some()
274} 274}