Author: sammccall Date: Wed Jan 24 09:50:20 2018 New Revision: 323347 URL: http://llvm.org/viewvc/llvm-project?rev=323347&view=rev Log: [CodeComplete] only respect LoadExternal hint at namespace/tu scope
Reviewers: ilya-biryukov Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D42428 Modified: cfe/trunk/include/clang-c/Index.h cfe/trunk/include/clang/Sema/CodeCompleteOptions.h cfe/trunk/lib/Sema/SemaLookup.cpp cfe/trunk/test/Index/complete-pch-skip.cpp Modified: cfe/trunk/include/clang-c/Index.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=323347&r1=323346&r2=323347&view=diff ============================================================================== --- cfe/trunk/include/clang-c/Index.h (original) +++ cfe/trunk/include/clang-c/Index.h Wed Jan 24 09:50:20 2018 @@ -5247,9 +5247,9 @@ enum CXCodeComplete_Flags { CXCodeComplete_IncludeBriefComments = 0x04, /** - * \brief Whether to speed up completion by omitting some entities which are - * defined in the preamble. There's no guarantee any particular entity will - * be omitted. This may be useful if the headers are indexed externally. + * Whether to speed up completion by omitting top- or namespace-level entities + * defined in the preamble. There's no guarantee any particular entity is + * omitted. This may be useful if the headers are indexed externally. */ CXCodeComplete_SkipPreamble = 0x08 }; Modified: cfe/trunk/include/clang/Sema/CodeCompleteOptions.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/CodeCompleteOptions.h?rev=323347&r1=323346&r2=323347&view=diff ============================================================================== --- cfe/trunk/include/clang/Sema/CodeCompleteOptions.h (original) +++ cfe/trunk/include/clang/Sema/CodeCompleteOptions.h Wed Jan 24 09:50:20 2018 @@ -35,8 +35,8 @@ public: /// Show brief documentation comments in code completion results. unsigned IncludeBriefComments : 1; - /// Hint whether to load data from the external AST in order to provide - /// full results. If false, declarations from the preamble may be omitted. + /// Hint whether to load data from the external AST to provide full results. + /// If false, namespace-level declarations from the preamble may be omitted. unsigned LoadExternal : 1; CodeCompleteOptions() Modified: cfe/trunk/lib/Sema/SemaLookup.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=323347&r1=323346&r2=323347&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaLookup.cpp (original) +++ cfe/trunk/lib/Sema/SemaLookup.cpp Wed Jan 24 09:50:20 2018 @@ -3543,10 +3543,13 @@ static void LookupVisibleDecls(DeclConte if (CXXRecordDecl *Class = dyn_cast<CXXRecordDecl>(Ctx)) Result.getSema().ForceDeclarationOfImplicitMembers(Class); + // We sometimes skip loading namespace-level results (they tend to be huge). + bool Load = LoadExternal || + !(isa<TranslationUnitDecl>(Ctx) || isa<NamespaceDecl>(Ctx)); // Enumerate all of the results in this context. for (DeclContextLookupResult R : - LoadExternal ? Ctx->lookups() - : Ctx->noload_lookups(/*PreserveInternalState=*/false)) { + Load ? Ctx->lookups() + : Ctx->noload_lookups(/*PreserveInternalState=*/false)) { for (auto *D : R) { if (auto *ND = Result.getAcceptableDecl(D)) { Consumer.FoundDecl(ND, Visited.checkHidden(ND), Ctx, InBaseClass); Modified: cfe/trunk/test/Index/complete-pch-skip.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/complete-pch-skip.cpp?rev=323347&r1=323346&r2=323347&view=diff ============================================================================== --- cfe/trunk/test/Index/complete-pch-skip.cpp (original) +++ cfe/trunk/test/Index/complete-pch-skip.cpp Wed Jan 24 09:50:20 2018 @@ -3,8 +3,9 @@ int bar; } int main() { return ns:: } +int main2() { return ns::foo(). } -// RUN: echo "namespace ns { int foo; }" > %t.h +// RUN: echo "namespace ns { struct foo { int baz }; }" > %t.h // RUN: c-index-test -write-pch %t.h.pch -x c++-header %t.h // // RUN: c-index-test -code-completion-at=%s:5:26 -include %t.h %s | FileCheck -check-prefix=WITH-PCH %s @@ -23,3 +24,7 @@ int main() { return ns:: } // NO-PCH: {TypedText bar} // NO-PCH-NOT: foo +// Verify that we still get member results from the preamble. +// RUN: env CINDEXTEST_COMPLETION_SKIP_PREAMBLE=1 c-index-test -code-completion-at=%s:6:32 -include %t.h %s | FileCheck -check-prefix=MEMBER %s +// MEMBER: {TypedText baz} + _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
