shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[CodeComplete] only respect LoadExternal hint at namespace/tu scope

Browse Source 
Reviewers: ilya-biryukov

Subscribers: cfe-commits

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

llvm-svn: 323347
This commit is contained in:
Sam McCall 2018-01-24 17:50:20 +00:00
parent cf3ad5841b
commit abdcc613b6
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang-c/Index.h
View File

@ -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
};

4
clang/include/clang/Sema/CodeCompleteOptions.h
View File

@ -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()

7
clang/lib/Sema/SemaLookup.cpp
View File

@ -3543,10 +3543,13 @@ static void LookupVisibleDecls(DeclContext *Ctx, LookupResult &Result,
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);

7
clang/test/Index/complete-pch-skip.cpp
View File

@ -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}