language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

More direct signature for resolve_path

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-05 15:07:30 +02:00
parent e63c00f100
commit bba374bab2
7 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir_expand/src/builtin_macro.rs
View file

@ -8,7 +8,7 @@ use crate::{
use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId};
use either::Either;
use mbe::parse_to_token_tree;
use ra_db::{FileId, RelativePath};
use ra_db::FileId;
use ra_parser::FragmentKind;
macro_rules! register_builtin {
@ -297,7 +297,7 @@ fn relative_file(db: &dyn AstDatabase, call_id: MacroCallId, path: &str) -> Opti
let call_site = call_id.as_file().original_file(db);
// Handle trivial case
if let Some(res) = db.resolve_path(call_site, &RelativePath::new(&path)) {
if let Some(res) = db.resolve_path(call_site, path) {
// Prevent include itself
return if res == call_site { None } else { Some(res) };
}