[libclang] Implement the importedASTFile indexing callback to provide
info about imported modules.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165020 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c
index 85dcddd..28ad59e 100644
--- a/tools/c-index-test/c-index-test.c
+++ b/tools/c-index-test/c-index-test.c
@@ -2349,6 +2349,24 @@
return (CXIdxClientFile)info->file;
}
+static CXIdxClientFile index_importedASTFile(CXClientData client_data,
+ const CXIdxImportedASTFileInfo *info) {
+ IndexData *index_data;
+ index_data = (IndexData *)client_data;
+ printCheck(index_data);
+
+ printf("[importedASTFile]: ");
+ printCXIndexFile((CXIdxClientFile)info->file);
+ printf(" | loc: ");
+ printCXIndexLoc(info->loc, client_data);
+ printf(" | module name: \"%s\"", info->moduleName);
+ printf(" | source name: \"%s\"", info->sourceName);
+ printf(" | isModule: %d | isIncludeDirective: %d\n",
+ info->isModule, info->isIncludeDirective);
+
+ return (CXIdxClientFile)info->file;
+}
+
static CXIdxClientContainer index_startedTranslationUnit(CXClientData client_data,
void *reserved) {
IndexData *index_data;
@@ -2479,7 +2497,7 @@
index_diagnostic,
index_enteredMainFile,
index_ppIncludedFile,
- 0, /*importedASTFile*/
+ index_importedASTFile,
index_startedTranslationUnit,
index_indexDeclaration,
index_indexEntityReference
diff --git a/tools/libclang/IndexDecl.cpp b/tools/libclang/IndexDecl.cpp
index 53a98f1..65b0b16 100644
--- a/tools/libclang/IndexDecl.cpp
+++ b/tools/libclang/IndexDecl.cpp
@@ -10,6 +10,7 @@
#include "IndexingContext.h"
#include "clang/AST/DeclVisitor.h"
+#include "clang/Basic/Module.h"
using namespace clang;
using namespace cxindex;
@@ -305,6 +306,14 @@
IndexCtx.indexTypeSourceInfo(D->getTemplatedDecl()->getTypeSourceInfo(), D);
return true;
}
+
+ bool VisitImportDecl(ImportDecl *D) {
+ Module *Imported = D->getImportedModule();
+ if (Imported)
+ IndexCtx.importedModule(D->getLocation(), Imported->getFullModuleName(),
+ /*isIncludeDirective=*/false, Imported);
+ return true;
+ }
};
} // anonymous namespace
diff --git a/tools/libclang/Indexing.cpp b/tools/libclang/Indexing.cpp
index c4fba96..efae7ee 100644
--- a/tools/libclang/Indexing.cpp
+++ b/tools/libclang/Indexing.cpp
@@ -73,6 +73,12 @@
StringRef SearchPath,
StringRef RelativePath,
const Module *Imported) {
+ if (Imported) {
+ IndexCtx.importedModule(HashLoc, FileName, /*isIncludeDirective=*/true,
+ Imported);
+ return;
+ }
+
bool isImport = (IncludeTok.is(tok::identifier) &&
IncludeTok.getIdentifierInfo()->getPPKeywordID() == tok::pp_import);
IndexCtx.ppIncludedFile(HashLoc, FileName, File, isImport, IsAngled);
diff --git a/tools/libclang/IndexingContext.cpp b/tools/libclang/IndexingContext.cpp
index 210dc36..3a3c010 100644
--- a/tools/libclang/IndexingContext.cpp
+++ b/tools/libclang/IndexingContext.cpp
@@ -253,6 +253,27 @@
FileMap[File] = idxFile;
}
+void IndexingContext::importedModule(SourceLocation Loc,
+ StringRef name, bool isIncludeDirective,
+ const Module *module) {
+ if (!CB.importedASTFile)
+ return;
+
+ std::string ModuleName = module->getFullModuleName();
+
+ ScratchAlloc SA(*this);
+ CXIdxImportedASTFileInfo Info = {
+ (CXFile)module->getASTFile(),
+ getIndexLoc(Loc),
+ /*isModule=*/true,
+ isIncludeDirective,
+ SA.toCStr(name),
+ ModuleName.c_str(),
+ };
+ CXIdxClientASTFile astFile = CB.importedASTFile(ClientData, &Info);
+ (void)astFile;
+}
+
void IndexingContext::startedTranslationUnit() {
CXIdxClientContainer idxCont = 0;
if (CB.startedTranslationUnit)
diff --git a/tools/libclang/IndexingContext.h b/tools/libclang/IndexingContext.h
index be21927..f74dd1a 100644
--- a/tools/libclang/IndexingContext.h
+++ b/tools/libclang/IndexingContext.h
@@ -382,6 +382,10 @@
StringRef filename, const FileEntry *File,
bool isImport, bool isAngled);
+ void importedModule(SourceLocation Loc,
+ StringRef name, bool isIncludeDirective,
+ const Module *module);
+
void startedTranslationUnit();
void indexDecl(const Decl *D);