1 files changed, 12 insertions, 9 deletions

diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs
index e6cc6329c..6d57da06a 100644
--- a/crates/ide_completion/src/context.rs
+++ b/crates/ide_completion/src/context.rs
@@ -120,7 +120,7 @@ impl<'a> CompletionContext<'a> {
         let original_token =
             original_file.syntax().token_at_offset(position.offset).left_biased()?;
         let token = sema.descend_into_macros(original_token.clone());
-        let scope = sema.scope_at_offset(&token.parent(), position.offset);
+        let scope = sema.scope_at_offset(&token, position.offset);
         let mut locals = vec![];
         scope.process_all_names(&mut |name, scope| {
             if let ScopeDef::Local(local) = scope {
@@ -281,7 +281,7 @@ impl<'a> CompletionContext<'a> {
     fn fill_impl_def(&mut self) {
         self.impl_def = self
             .sema
-            .ancestors_with_macros(self.token.parent())
+            .token_ancestors_with_macros(self.token.clone())
             .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE)
             .find_map(ast::Impl::cast);
     }
@@ -293,7 +293,10 @@ impl<'a> CompletionContext<'a> {
         offset: TextSize,
     ) {
         let expected = {
-            let mut node = self.token.parent();
+            let mut node = match self.token.parent() {
+                Some(it) => it,
+                None => return,
+            };
             loop {
                 let ret = match_ast! {
                     match node {
@@ -310,7 +313,7 @@ impl<'a> CompletionContext<'a> {
 
                             (ty, name)
                         },
-                        ast::ArgList(it) => {
+                        ast::ArgList(_it) => {
                             cov_mark::hit!(expected_type_fn_param_with_leading_char);
                             cov_mark::hit!(expected_type_fn_param_without_leading_char);
                             ActiveParameter::at_token(
@@ -319,7 +322,7 @@ impl<'a> CompletionContext<'a> {
                             ).map(|ap| (Some(ap.ty), Some(ap.name)))
                             .unwrap_or((None, None))
                         },
-                        ast::RecordExprFieldList(it) => {
+                        ast::RecordExprFieldList(_it) => {
                             cov_mark::hit!(expected_type_struct_field_without_leading_char);
                             self.token.prev_sibling_or_token()
                                 .and_then(|se| se.into_node())
@@ -355,7 +358,7 @@ impl<'a> CompletionContext<'a> {
 
                             (ty, None)
                         },
-                        ast::Fn(it) => {
+                        ast::Fn(_it) => {
                             cov_mark::hit!(expected_type_fn_ret_with_leading_char);
                             cov_mark::hit!(expected_type_fn_ret_without_leading_char);
                             let ty = self.token.ancestors()
@@ -474,17 +477,17 @@ impl<'a> CompletionContext<'a> {
         }
 
         self.use_item_syntax =
-            self.sema.ancestors_with_macros(self.token.parent()).find_map(ast::Use::cast);
+            self.sema.token_ancestors_with_macros(self.token.clone()).find_map(ast::Use::cast);
 
         self.function_syntax = self
             .sema
-            .ancestors_with_macros(self.token.parent())
+            .token_ancestors_with_macros(self.token.clone())
             .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE)
             .find_map(ast::Fn::cast);
 
         self.record_field_syntax = self
             .sema
-            .ancestors_with_macros(self.token.parent())
+            .token_ancestors_with_macros(self.token.clone())
             .take_while(|it| {
                 it.kind() != SOURCE_FILE && it.kind() != MODULE && it.kind() != CALL_EXPR
             })