diff options
| author | Benjamin Coenen <[email protected]> | 2020-05-02 11:25:04 +0100 |
|---|---|---|
| committer | Benjamin Coenen <[email protected]> | 2020-05-02 11:25:04 +0100 |
| commit | 0b40876b993ab30421624b831cb03b4042eb0142 (patch) | |
| tree | 85abb233dd8645480d61ab857a2b46c1209b142a /crates/ra_hir/src/source_analyzer.rs | |
| parent | eea21738ab9e0b7438d03f7b2efc18c15cc30cf2 (diff) | |
| parent | 75bc0249463b72971200e482d69dad88d4e76ae3 (diff) | |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_hir/src/source_analyzer.rs')
| -rw-r--r-- | crates/ra_hir/src/source_analyzer.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs index 74d64c97d..c63d1b847 100644 --- a/crates/ra_hir/src/source_analyzer.rs +++ b/crates/ra_hir/src/source_analyzer.rs | |||
| @@ -224,7 +224,8 @@ impl SourceAnalyzer { | |||
| 224 | } | 224 | } |
| 225 | } | 225 | } |
| 226 | // This must be a normal source file rather than macro file. | 226 | // This must be a normal source file rather than macro file. |
| 227 | let hir_path = crate::Path::from_ast(path.clone())?; | 227 | let hir_path = |
| 228 | crate::Path::from_src(path.clone(), &Hygiene::new(db.upcast(), self.file_id))?; | ||
| 228 | resolve_hir_path(db, &self.resolver, &hir_path) | 229 | resolve_hir_path(db, &self.resolver, &hir_path) |
| 229 | } | 230 | } |
| 230 | 231 | ||