diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-07-14 17:44:04 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-07-14 17:44:04 +0000 |
| commit | 9f1570d9939c58883b0914710a5a297413f6750c (patch) | |
| tree | a77bb7de464a724b74172e057b97907ae3016a47 | |
| parent | 042523340bb39407032152b681f2f4d0920b1d59 (diff) | |
| download | bcm5719-llvm-9f1570d9939c58883b0914710a5a297413f6750c.tar.gz bcm5719-llvm-9f1570d9939c58883b0914710a5a297413f6750c.zip | |
Only filter out names reserved for the implementation (e.g., __blah or
_Foo) from code-completion results when they come from a system
header.
llvm-svn: 108338
| -rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 7 | ||||
| -rw-r--r-- | clang/test/CodeCompletion/Inputs/reserved.h | 2 | ||||
| -rw-r--r-- | clang/test/CodeCompletion/ordinary-name.c | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index 82861101e83..55288750fd5 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -407,13 +407,16 @@ bool ResultBuilder::isInterestingDecl(NamedDecl *ND, return false; // Filter out names reserved for the implementation (C99 7.1.3, - // C++ [lib.global.names]). Users don't need to see those. + // C++ [lib.global.names]) if they come from a system header. // // FIXME: Add predicate for this. if (Id->getLength() >= 2) { const char *Name = Id->getNameStart(); if (Name[0] == '_' && - (Name[1] == '_' || (Name[1] >= 'A' && Name[1] <= 'Z'))) + (Name[1] == '_' || (Name[1] >= 'A' && Name[1] <= 'Z')) && + (ND->getLocation().isInvalid() || + SemaRef.SourceMgr.isInSystemHeader( + SemaRef.SourceMgr.getSpellingLoc(ND->getLocation())))) return false; } } diff --git a/clang/test/CodeCompletion/Inputs/reserved.h b/clang/test/CodeCompletion/Inputs/reserved.h new file mode 100644 index 00000000000..fafe4ac440e --- /dev/null +++ b/clang/test/CodeCompletion/Inputs/reserved.h @@ -0,0 +1,2 @@ +typedef int _INTEGER_TYPE; +typedef float FLOATING_TYPE; diff --git a/clang/test/CodeCompletion/ordinary-name.c b/clang/test/CodeCompletion/ordinary-name.c index 1580d01fd31..0807b74b12c 100644 --- a/clang/test/CodeCompletion/ordinary-name.c +++ b/clang/test/CodeCompletion/ordinary-name.c @@ -1,10 +1,14 @@ +#include <reserved.h> struct X { int x; }; - typedef struct t TYPEDEF; - +typedef struct t _TYPEDEF; void foo() { int y; - // RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:6:9 %s -o - | FileCheck -check-prefix=CHECK-CC1 %s + // RUN: %clang_cc1 -isystem %S/Inputs -fsyntax-only -code-completion-at=%s:6:9 %s -o - | FileCheck -check-prefix=CHECK-CC1 %s + // CHECK-CC1: _Imaginary + // CHECK-CC1-NOT: _INTEGER_TYPE; + // CHECK-CC1: _TYPEDEF + // CHECK-CC1: FLOATING_TYPE // CHECK-CC1: foo - // CHECK-CC1: y // CHECK-CC1: TYPEDEF + // CHECK-CC1: y |
