diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-06 13:45:22 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-06 13:45:22 +0000 |
| commit | eaf553dade9a28b41631387d7c88b09fd0ba64e2 (patch) | |
| tree | f5043da62c6cf4e2f082f68746843de7dfe53d03 /crates/ra_analysis/src/goto_defenition.rs | |
| parent | cbac31cbdb2168b18fc6fb89f5cf069238cc6ccb (diff) | |
| parent | 98957f4e6f66469310072dff5dfc3e521a7cd555 (diff) | |
Merge #441
441: hir::Expr r=matklad a=flodiebold
Still a bit to do, but I already adapted `FnScopes` and thought I'd get feedback already.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/goto_defenition.rs')
| -rw-r--r-- | crates/ra_analysis/src/goto_defenition.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_analysis/src/goto_defenition.rs b/crates/ra_analysis/src/goto_defenition.rs index e37421f8d..68b6ac3ba 100644 --- a/crates/ra_analysis/src/goto_defenition.rs +++ b/crates/ra_analysis/src/goto_defenition.rs | |||
| @@ -28,7 +28,7 @@ pub(crate) fn reference_defenition( | |||
| 28 | if let Some(fn_descr) = | 28 | if let Some(fn_descr) = |
| 29 | hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax())? | 29 | hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax())? |
| 30 | { | 30 | { |
| 31 | let scope = fn_descr.scopes(db); | 31 | let scope = fn_descr.scopes(db)?; |
| 32 | // First try to resolve the symbol locally | 32 | // First try to resolve the symbol locally |
| 33 | if let Some(entry) = scope.resolve_local_name(name_ref) { | 33 | if let Some(entry) = scope.resolve_local_name(name_ref) { |
| 34 | let nav = NavigationTarget { | 34 | let nav = NavigationTarget { |