diff options
| author | Seivan Heidari <[email protected]> | 2019-11-04 12:45:27 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-04 12:45:27 +0000 |
| commit | dad9bc6caad71e6aebb92ad9883c08d30431e9b1 (patch) | |
| tree | 6495d47108bc56ab0fbb358125fe65ebece8934f /crates/ra_hir/src/source_binder.rs | |
| parent | 1d8bb4c6c1fef1f8ea513e07d0a7d4c5483129d2 (diff) | |
| parent | cc2d75d0f88bdcb1b3e20db36decb6ee6eca517a (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir/src/source_binder.rs')
| -rw-r--r-- | crates/ra_hir/src/source_binder.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index a4ca59bba..66cb4b357 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs | |||
| @@ -253,8 +253,11 @@ impl SourceAnalyzer { | |||
| 253 | Some(res) | 253 | Some(res) |
| 254 | }); | 254 | }); |
| 255 | 255 | ||
| 256 | let items = | 256 | let items = self |
| 257 | self.resolver.resolve_module_path(db, &path).take_types().map(PathResolution::Def); | 257 | .resolver |
| 258 | .resolve_module_path(db, &path) | ||
| 259 | .take_types() | ||
| 260 | .map(|it| PathResolution::Def(it.into())); | ||
| 258 | types.or(values).or(items).or_else(|| { | 261 | types.or(values).or(items).or_else(|| { |
| 259 | self.resolver.resolve_path_as_macro(db, &path).map(|def| PathResolution::Macro(def)) | 262 | self.resolver.resolve_path_as_macro(db, &path).map(|def| PathResolution::Macro(def)) |
| 260 | }) | 263 | }) |