From e63c00f100e960f7b72997026b4b2cd3cd29774b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 5 Jun 2020 14:55:23 +0200
Subject: [PATCH] Rename resolve_relative_path -> resolve_path
For things like `concant!(env!("OUT_DIR"))`, we need to support abs paths
---
crates/ra_db/src/lib.rs | 9 ++-------
crates/ra_hir_def/src/nameres/mod_resolution.rs | 2 +-
crates/ra_hir_def/src/test_db.rs | 8 ++------
crates/ra_hir_expand/src/builtin_macro.rs | 2 +-
crates/ra_hir_expand/src/test_db.rs | 8 ++------
crates/ra_hir_ty/src/test_db.rs | 8 ++------
crates/ra_ide_db/src/lib.rs | 8 ++------
7 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index fd4280de2df..07e1b8aba33 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -89,8 +89,7 @@ pub const DEFAULT_LRU_CAP: usize = 128;
pub trait FileLoader {
/// Text of the file.
fn file_text(&self, file_id: FileId) -> Arc<String>;
- fn resolve_relative_path(&self, anchor: FileId, relative_path: &RelativePath)
- -> Option<FileId>;
+ fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId>;
fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>>;
fn resolve_extern_path(
@@ -155,11 +154,7 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
fn file_text(&self, file_id: FileId) -> Arc<String> {
SourceDatabaseExt::file_text(self.0, file_id)
}
- fn resolve_relative_path(
- &self,
- anchor: FileId,
- relative_path: &RelativePath,
- ) -> Option<FileId> {
+ fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId> {
let path = {
let mut path = self.0.file_relative_path(anchor);
assert!(path.pop());
diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/ra_hir_def/src/nameres/mod_resolution.rs
index 386c5cade62..7af922c2157 100644
--- a/crates/ra_hir_def/src/nameres/mod_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/mod_resolution.rs
@@ -61,7 +61,7 @@ impl ModDir {
};
for candidate in candidate_files.iter() {
- if let Some(file_id) = db.resolve_relative_path(file_id, candidate) {
+ if let Some(file_id) = db.resolve_path(file_id, candidate) {
let mut root_non_dir_owner = false;
let mut mod_path = RelativePathBuf::new();
if !(candidate.ends_with("mod.rs") || attr_path.is_some()) {
diff --git a/crates/ra_hir_def/src/test_db.rs b/crates/ra_hir_def/src/test_db.rs
index eb83dee799e..d33b57c93ac 100644
--- a/crates/ra_hir_def/src/test_db.rs
+++ b/crates/ra_hir_def/src/test_db.rs
@@ -58,12 +58,8 @@ impl FileLoader for TestDB {
fn file_text(&self, file_id: FileId) -> Arc<String> {
FileLoaderDelegate(self).file_text(file_id)
}
- fn resolve_relative_path(
- &self,
- anchor: FileId,
- relative_path: &RelativePath,
- ) -> Option<FileId> {
- FileLoaderDelegate(self).resolve_relative_path(anchor, relative_path)
+ fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId> {
+ FileLoaderDelegate(self).resolve_path(anchor, relative_path)
}
fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
FileLoaderDelegate(self).relevant_crates(file_id)
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index 3bce8f673fd..4374d9eda33 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -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_relative_path(call_site, &RelativePath::new(&path)) {
+ if let Some(res) = db.resolve_path(call_site, &RelativePath::new(&path)) {
// Prevent include itself
return if res == call_site { None } else { Some(res) };
}
diff --git a/crates/ra_hir_expand/src/test_db.rs b/crates/ra_hir_expand/src/test_db.rs
index c1fb762debf..60321fa0a3b 100644
--- a/crates/ra_hir_expand/src/test_db.rs
+++ b/crates/ra_hir_expand/src/test_db.rs
@@ -41,12 +41,8 @@ impl FileLoader for TestDB {
fn file_text(&self, file_id: FileId) -> Arc<String> {
FileLoaderDelegate(self).file_text(file_id)
}
- fn resolve_relative_path(
- &self,
- anchor: FileId,
- relative_path: &RelativePath,
- ) -> Option<FileId> {
- FileLoaderDelegate(self).resolve_relative_path(anchor, relative_path)
+ fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId> {
+ FileLoaderDelegate(self).resolve_path(anchor, relative_path)
}
fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
FileLoaderDelegate(self).relevant_crates(file_id)
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs
index 8498d3d966d..43927c99155 100644
--- a/crates/ra_hir_ty/src/test_db.rs
+++ b/crates/ra_hir_ty/src/test_db.rs
@@ -72,12 +72,8 @@ impl FileLoader for TestDB {
fn file_text(&self, file_id: FileId) -> Arc<String> {
FileLoaderDelegate(self).file_text(file_id)
}
- fn resolve_relative_path(
- &self,
- anchor: FileId,
- relative_path: &RelativePath,
- ) -> Option<FileId> {
- FileLoaderDelegate(self).resolve_relative_path(anchor, relative_path)
+ fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId> {
+ FileLoaderDelegate(self).resolve_path(anchor, relative_path)
}
fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
FileLoaderDelegate(self).relevant_crates(file_id)
diff --git a/crates/ra_ide_db/src/lib.rs b/crates/ra_ide_db/src/lib.rs
index 1b74e655861..72793d63d3f 100644
--- a/crates/ra_ide_db/src/lib.rs
+++ b/crates/ra_ide_db/src/lib.rs
@@ -57,12 +57,8 @@ impl FileLoader for RootDatabase {
fn file_text(&self, file_id: FileId) -> Arc<String> {
FileLoaderDelegate(self).file_text(file_id)
}
- fn resolve_relative_path(
- &self,
- anchor: FileId,
- relative_path: &RelativePath,
- ) -> Option<FileId> {
- FileLoaderDelegate(self).resolve_relative_path(anchor, relative_path)
+ fn resolve_path(&self, anchor: FileId, relative_path: &RelativePath) -> Option<FileId> {
+ FileLoaderDelegate(self).resolve_path(anchor, relative_path)
}
fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
FileLoaderDelegate(self).relevant_crates(file_id)