[include-fixer] Also look up prefixes of queries.
This is used to find nested classes. For a nested name foo::bar::qux we will first look up foo::bar::qux, then foo::bar, then foo unless we find a result. This is used to support nested classes which are not part of the index but can only be used if the header for the parent context is included. Differential Revision: http://reviews.llvm.org/D20372 llvm-svn: 269956
This commit is contained in:
parent
350b29862f
commit
5e6b35f4d1
|
@ -24,53 +24,61 @@ SymbolIndexManager::search(llvm::StringRef Identifier) const {
|
||||||
llvm::SmallVector<llvm::StringRef, 8> Names;
|
llvm::SmallVector<llvm::StringRef, 8> Names;
|
||||||
Identifier.split(Names, "::");
|
Identifier.split(Names, "::");
|
||||||
|
|
||||||
std::vector<clang::find_all_symbols::SymbolInfo> Symbols;
|
// As long as we don't find a result keep stripping name parts from the end.
|
||||||
for (const auto &DB : SymbolIndices) {
|
// This is to support nested classes which aren't recorded in the database.
|
||||||
auto Res = DB->search(Names.back().str());
|
// Eventually we will either hit a class (namespaces aren't in the database
|
||||||
Symbols.insert(Symbols.end(), Res.begin(), Res.end());
|
// either) and can report that result.
|
||||||
}
|
|
||||||
|
|
||||||
DEBUG(llvm::dbgs() << "Searching " << Names.back() << "... got "
|
|
||||||
<< Symbols.size() << " results...\n");
|
|
||||||
|
|
||||||
std::vector<std::string> Results;
|
std::vector<std::string> Results;
|
||||||
for (const auto &Symbol : Symbols) {
|
while (Results.empty() && !Names.empty()) {
|
||||||
// Match the identifier name without qualifier.
|
std::vector<clang::find_all_symbols::SymbolInfo> Symbols;
|
||||||
if (Symbol.getName() == Names.back()) {
|
for (const auto &DB : SymbolIndices) {
|
||||||
bool IsMatched = true;
|
auto Res = DB->search(Names.back().str());
|
||||||
auto SymbolContext = Symbol.getContexts().begin();
|
Symbols.insert(Symbols.end(), Res.begin(), Res.end());
|
||||||
auto IdentiferContext = Names.rbegin() + 1; // Skip identifier name;
|
}
|
||||||
// Match the remaining context names.
|
|
||||||
while (IdentiferContext != Names.rend() &&
|
DEBUG(llvm::dbgs() << "Searching " << Names.back() << "... got "
|
||||||
SymbolContext != Symbol.getContexts().end()) {
|
<< Symbols.size() << " results...\n");
|
||||||
if (SymbolContext->second == *IdentiferContext) {
|
|
||||||
++IdentiferContext;
|
for (const auto &Symbol : Symbols) {
|
||||||
++SymbolContext;
|
// Match the identifier name without qualifier.
|
||||||
} else if (SymbolContext->first ==
|
if (Symbol.getName() == Names.back()) {
|
||||||
find_all_symbols::SymbolInfo::ContextType::EnumDecl) {
|
bool IsMatched = true;
|
||||||
// Skip non-scoped enum context.
|
auto SymbolContext = Symbol.getContexts().begin();
|
||||||
++SymbolContext;
|
auto IdentiferContext = Names.rbegin() + 1; // Skip identifier name.
|
||||||
} else {
|
// Match the remaining context names.
|
||||||
IsMatched = false;
|
while (IdentiferContext != Names.rend() &&
|
||||||
break;
|
SymbolContext != Symbol.getContexts().end()) {
|
||||||
|
if (SymbolContext->second == *IdentiferContext) {
|
||||||
|
++IdentiferContext;
|
||||||
|
++SymbolContext;
|
||||||
|
} else if (SymbolContext->first ==
|
||||||
|
find_all_symbols::SymbolInfo::ContextType::EnumDecl) {
|
||||||
|
// Skip non-scoped enum context.
|
||||||
|
++SymbolContext;
|
||||||
|
} else {
|
||||||
|
IsMatched = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: Support full match. At this point, we only find symbols in
|
||||||
|
// database which end with the same contexts with the identifier.
|
||||||
|
if (IsMatched && IdentiferContext == Names.rend()) {
|
||||||
|
// FIXME: file path should never be in the form of <...> or "...", but
|
||||||
|
// the unit test with fixed database use <...> file path, which might
|
||||||
|
// need to be changed.
|
||||||
|
// FIXME: if the file path is a system header name, we want to use
|
||||||
|
// angle brackets.
|
||||||
|
std::string FilePath = Symbol.getFilePath().str();
|
||||||
|
Results.push_back((FilePath[0] == '"' || FilePath[0] == '<')
|
||||||
|
? FilePath
|
||||||
|
: "\"" + FilePath + "\"");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: Support full match. At this point, we only find symbols in
|
|
||||||
// database which end with the same contexts with the identifier.
|
|
||||||
if (IsMatched && IdentiferContext == Names.rend()) {
|
|
||||||
// FIXME: file path should never be in the form of <...> or "...", but
|
|
||||||
// the unit test with fixed database use <...> file path, which might
|
|
||||||
// need to be changed.
|
|
||||||
// FIXME: if the file path is a system header name, we want to use angle
|
|
||||||
// brackets.
|
|
||||||
std::string FilePath = Symbol.getFilePath().str();
|
|
||||||
Results.push_back((FilePath[0] == '"' || FilePath[0] == '<')
|
|
||||||
? FilePath
|
|
||||||
: "\"" + FilePath + "\"");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Names.pop_back();
|
||||||
}
|
}
|
||||||
|
|
||||||
return Results;
|
return Results;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,9 +55,6 @@ static std::string runIncludeFixer(
|
||||||
{{SymbolInfo::ContextType::Namespace, "std"}}),
|
{{SymbolInfo::ContextType::Namespace, "std"}}),
|
||||||
SymbolInfo("sting", SymbolInfo::SymbolKind::Class, "\"sting\"", 1,
|
SymbolInfo("sting", SymbolInfo::SymbolKind::Class, "\"sting\"", 1,
|
||||||
{{SymbolInfo::ContextType::Namespace, "std"}}),
|
{{SymbolInfo::ContextType::Namespace, "std"}}),
|
||||||
SymbolInfo("size_type", SymbolInfo::SymbolKind::Variable, "<string>", 1,
|
|
||||||
{{SymbolInfo::ContextType::Namespace, "string"},
|
|
||||||
{SymbolInfo::ContextType::Namespace, "std"}}),
|
|
||||||
SymbolInfo("foo", SymbolInfo::SymbolKind::Class, "\"dir/otherdir/qux.h\"",
|
SymbolInfo("foo", SymbolInfo::SymbolKind::Class, "\"dir/otherdir/qux.h\"",
|
||||||
1, {{SymbolInfo::ContextType::Namespace, "b"},
|
1, {{SymbolInfo::ContextType::Namespace, "b"},
|
||||||
{SymbolInfo::ContextType::Namespace, "a"}}),
|
{SymbolInfo::ContextType::Namespace, "a"}}),
|
||||||
|
|
Loading…
Reference in New Issue