diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-16 13:14:48 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-16 13:14:48 +0000 |
commit | c49b5b7468a9954af86fd1724276261f396aba5d (patch) | |
tree | f9b9126cd0cc9a2829de3cdb20f681b354fbe67b /crates/ide/src/hover.rs | |
parent | 1a82af3527e476d52410ff4dfd2fb4c57466abcb (diff) | |
parent | f5a81ec4683613bd62624811733345d627f2127b (diff) |
Merge #7498
7498: Clone for update r=matklad a=matklad
rowan counterpart https://github.com/rust-analyzer/rowan/pull/93
#6857
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide/src/hover.rs')
-rw-r--r-- | crates/ide/src/hover.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index a35805c5e..8d45b4875 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs | |||
@@ -92,7 +92,7 @@ pub(crate) fn hover( | |||
92 | 92 | ||
93 | let mut res = HoverResult::default(); | 93 | let mut res = HoverResult::default(); |
94 | 94 | ||
95 | let node = token.parent(); | 95 | let node = token.parent()?; |
96 | let definition = match_ast! { | 96 | let definition = match_ast! { |
97 | match node { | 97 | match node { |
98 | // we don't use NameClass::referenced_or_defined here as we do not want to resolve | 98 | // we don't use NameClass::referenced_or_defined here as we do not want to resolve |
@@ -421,7 +421,7 @@ fn hover_for_keyword( | |||
421 | if !token.kind().is_keyword() { | 421 | if !token.kind().is_keyword() { |
422 | return None; | 422 | return None; |
423 | } | 423 | } |
424 | let famous_defs = FamousDefs(&sema, sema.scope(&token.parent()).krate()); | 424 | let famous_defs = FamousDefs(&sema, sema.scope(&token.parent()?).krate()); |
425 | // std exposes {}_keyword modules with docstrings on the root to document keywords | 425 | // std exposes {}_keyword modules with docstrings on the root to document keywords |
426 | let keyword_mod = format!("{}_keyword", token.text()); | 426 | let keyword_mod = format!("{}_keyword", token.text()); |
427 | let doc_owner = find_std_module(&famous_defs, &keyword_mod)?; | 427 | let doc_owner = find_std_module(&famous_defs, &keyword_mod)?; |