[clangd] Pass file when possible to resolve URI.

Some URI scheme needs the hint path to do a correct resolution, we pass
one of the open files as hint path.

This is not perfect, and it might not work for opening files across
project, but it would fix a bug with our internal scheme.

in the long run, removing URIs from all the index internals is a more proper fix.

Differential Revision: https://reviews.llvm.org/D96844

diff --git a/clang-tools-extra/clangd/index/MemIndex.cpp b/clang-tools-extra/clangd/index/MemIndex.cpp
index a578ed2..e2a8eb7 100644 (file)
--- a/clang-tools-extra/clangd/index/MemIndex.cpp
+++ b/clang-tools-extra/clangd/index/MemIndex.cpp
@@ -112,9 +112,11 @@ void MemIndex::relations(
 llvm::unique_function<IndexContents(llvm::StringRef) const>
 MemIndex::indexedFiles() const {
   return [this](llvm::StringRef FileURI) {
-    auto Path = URI::resolve(FileURI);
+    if (Files.empty())
+      return IndexContents::None;
+    auto Path = URI::resolve(FileURI, Files.begin()->first());
     if (!Path) {
-      llvm::consumeError(Path.takeError());
+      vlog("Failed to resolve the URI {0} : {1}", FileURI, Path.takeError());
       return IndexContents::None;
     }
     return Files.contains(*Path) ? IdxContents : IndexContents::None;

diff --git a/clang-tools-extra/clangd/index/dex/Dex.cpp b/clang-tools-extra/clangd/index/dex/Dex.cpp
index 8552fa3..a6a8f23 100644 (file)
--- a/clang-tools-extra/clangd/index/dex/Dex.cpp
+++ b/clang-tools-extra/clangd/index/dex/Dex.cpp
@@ -316,9 +316,11 @@ void Dex::relations(
 llvm::unique_function<IndexContents(llvm::StringRef) const>
 Dex::indexedFiles() const {
   return [this](llvm::StringRef FileURI) {
-    auto Path = URI::resolve(FileURI);
+    if (Files.empty())
+      return IndexContents::None;
+    auto Path = URI::resolve(FileURI, Files.begin()->first());
     if (!Path) {
-      llvm::consumeError(Path.takeError());
+      vlog("Failed to resolve the URI {0} : {1}", FileURI, Path.takeError());
       return IndexContents::None;
     }
     return Files.contains(*Path) ? IdxContents : IndexContents::None;