Re: [PATCH] D20372: [include-fixer] Also look up prefixes of queries.
This revision was automatically updated to reflect the committed changes.
Closed by commit rL269956: [include-fixer] Also look up prefixes of queries.
(authored by d0k).
Changed prior to commit:
http://reviews.llvm.org/D20372?vs=57635=57642#toc
Repository:
rL LLVM
http://reviews.llvm.org/D20372
Files:
clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp
clang-tools-extra/trunk/unittests/include-fixer/IncludeFixerTest.cpp
Index: clang-tools-extra/trunk/unittests/include-fixer/IncludeFixerTest.cpp
===
--- clang-tools-extra/trunk/unittests/include-fixer/IncludeFixerTest.cpp
+++ clang-tools-extra/trunk/unittests/include-fixer/IncludeFixerTest.cpp
@@ -55,9 +55,6 @@
{{SymbolInfo::ContextType::Namespace, "std"}}),
SymbolInfo("sting", SymbolInfo::SymbolKind::Class, "\"sting\"", 1,
{{SymbolInfo::ContextType::Namespace, "std"}}),
- SymbolInfo("size_type", SymbolInfo::SymbolKind::Variable, "", 1,
- {{SymbolInfo::ContextType::Namespace, "string"},
- {SymbolInfo::ContextType::Namespace, "std"}}),
SymbolInfo("foo", SymbolInfo::SymbolKind::Class, "\"dir/otherdir/qux.h\"",
1, {{SymbolInfo::ContextType::Namespace, "b"},
{SymbolInfo::ContextType::Namespace, "a"}}),
Index: clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp
===
--- clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp
+++ clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp
@@ -24,53 +24,61 @@
llvm::SmallVector Names;
Identifier.split(Names, "::");
- std::vector Symbols;
- for (const auto : SymbolIndices) {
-auto Res = DB->search(Names.back().str());
-Symbols.insert(Symbols.end(), Res.begin(), Res.end());
- }
+ // As long as we don't find a result keep stripping name parts from the end.
+ // This is to support nested classes which aren't recorded in the database.
+ // Eventually we will either hit a class (namespaces aren't in the database
+ // either) and can report that result.
+ std::vector Results;
+ while (Results.empty() && !Names.empty()) {
+std::vector Symbols;
+for (const auto : SymbolIndices) {
+ auto Res = DB->search(Names.back().str());
+ Symbols.insert(Symbols.end(), Res.begin(), Res.end());
+}
- DEBUG(llvm::dbgs() << "Searching " << Names.back() << "... got "
- << Symbols.size() << " results...\n");
+DEBUG(llvm::dbgs() << "Searching " << Names.back() << "... got "
+ << Symbols.size() << " results...\n");
- std::vector Results;
- for (const auto : Symbols) {
-// Match the identifier name without qualifier.
-if (Symbol.getName() == Names.back()) {
- bool IsMatched = true;
- auto SymbolContext = Symbol.getContexts().begin();
- auto IdentiferContext = Names.rbegin() + 1; // Skip identifier name;
- // Match the remaining context names.
- while (IdentiferContext != Names.rend() &&
- 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;
+for (const auto : Symbols) {
+ // Match the identifier name without qualifier.
+ if (Symbol.getName() == Names.back()) {
+bool IsMatched = true;
+auto SymbolContext = Symbol.getContexts().begin();
+auto IdentiferContext = Names.rbegin() + 1; // Skip identifier name.
+// Match the remaining context names.
+while (IdentiferContext != Names.rend() &&
+ 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.
-
Re: [PATCH] D20372: [include-fixer] Also look up prefixes of queries.
hokein accepted this revision. hokein added a comment. This revision is now accepted and ready to land. LGTM. http://reviews.llvm.org/D20372 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D20372: [include-fixer] Also look up prefixes of queries.
bkramer created this revision.
bkramer added reviewers: hokein, ioeric.
bkramer added a subscriber: cfe-commits.
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.
http://reviews.llvm.org/D20372
Files:
include-fixer/SymbolIndexManager.cpp
unittests/include-fixer/IncludeFixerTest.cpp
Index: unittests/include-fixer/IncludeFixerTest.cpp
===
--- unittests/include-fixer/IncludeFixerTest.cpp
+++ unittests/include-fixer/IncludeFixerTest.cpp
@@ -55,9 +55,6 @@
{{SymbolInfo::ContextType::Namespace, "std"}}),
SymbolInfo("sting", SymbolInfo::SymbolKind::Class, "\"sting\"", 1,
{{SymbolInfo::ContextType::Namespace, "std"}}),
- SymbolInfo("size_type", SymbolInfo::SymbolKind::Variable, "", 1,
- {{SymbolInfo::ContextType::Namespace, "string"},
- {SymbolInfo::ContextType::Namespace, "std"}}),
SymbolInfo("foo", SymbolInfo::SymbolKind::Class, "\"dir/otherdir/qux.h\"",
1, {{SymbolInfo::ContextType::Namespace, "b"},
{SymbolInfo::ContextType::Namespace, "a"}}),
Index: include-fixer/SymbolIndexManager.cpp
===
--- include-fixer/SymbolIndexManager.cpp
+++ include-fixer/SymbolIndexManager.cpp
@@ -24,52 +24,59 @@
llvm::SmallVector Names;
Identifier.split(Names, "::");
- std::vector Symbols;
- for (const auto : SymbolIndices) {
-auto Res = DB->search(Names.back().str());
-Symbols.insert(Symbols.end(), Res.begin(), Res.end());
- }
+ // As long as we don't find a result keep stripping name parts from the end.
+ // This is to support nested classes which aren't recorded in the database.
+ // Eventually we will either hit a class (namespaces aren't in the database
+ // either) and can report that result.
+ std::vector Results;
+ while (Results.empty() && !Names.empty()) {
+std::vector Symbols;
+for (const auto : SymbolIndices) {
+ auto Res = DB->search(Names.back().str());
+ Symbols.insert(Symbols.end(), Res.begin(), Res.end());
+}
- DEBUG(llvm::dbgs() << "Searching " << Names.back() << "... got "
- << Symbols.size() << " results...\n");
+DEBUG(llvm::dbgs() << "Searching " << Names.back() << "... got "
+ << Symbols.size() << " results...\n");
- std::vector Results;
- for (const auto : Symbols) {
-// Match the identifier name without qualifier.
-if (Symbol.getName() == Names.back()) {
- bool IsMatched = true;
- auto SymbolContext = Symbol.getContexts().begin();
- auto IdentiferContext = Names.rbegin() + 1; // Skip identifier name;
- // Match the remaining context names.
- while (IdentiferContext != Names.rend() &&
- 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;
+for (const auto : Symbols) {
+ // Match the identifier name without qualifier.
+ if (Symbol.getName() == Names.back()) {
+bool IsMatched = true;
+auto SymbolContext = Symbol.getContexts().begin();
+auto IdentiferContext = Names.rbegin() + 1; // Skip identifier name;
+// Match the remaining context names.
+while (IdentiferContext != Names.rend() &&
+ 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();
-
