diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-08-23 19:33:40 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-08-23 19:33:40 +0000 |
| commit | 6d72cbedbab7eea947f34ddc6a44c3b308530034 (patch) | |
| tree | 29443ee42527ab047e7b77d5fc6794a48c22e771 | |
| parent | 000835d0b04345c0014c603fe6339b3bc154050e (diff) | |
Don't include macro results when we're completing a declarator.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@111830 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Frontend/ASTUnit.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaCodeComplete.cpp | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index c7d47309cf..14ff75d5c6 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -276,9 +276,7 @@ void ASTUnit::CacheCodeCompletionResults() { | (1 << (CodeCompletionContext::CCC_ClassStructUnion - 1)) | (1 << (CodeCompletionContext::CCC_Statement - 1)) | (1 << (CodeCompletionContext::CCC_Expression - 1)) - | (1 << (CodeCompletionContext::CCC_ObjCMessageReceiver - 1)) - | (1 << (CodeCompletionContext::CCC_Name - 1)) - | (1 << (CodeCompletionContext::CCC_PotentiallyQualifiedName - 1)); + | (1 << (CodeCompletionContext::CCC_ObjCMessageReceiver - 1)); CachedResult.Priority = Results[I].Priority; CachedResult.Kind = Results[I].CursorKind; diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp index bdcc3ac546..61c17c89bd 100644 --- a/lib/Sema/SemaCodeComplete.cpp +++ b/lib/Sema/SemaCodeComplete.cpp @@ -2296,10 +2296,6 @@ void Sema::CodeCompleteDeclarator(Scope *S, } Results.ExitScope(); - // Allow macros for names. - if (CodeCompleter->includeMacros()) - AddMacroResults(PP, Results); - HandleCodeCompleteResults(this, CodeCompleter, AllowNestedNameSpecifiers ? CodeCompletionContext::CCC_PotentiallyQualifiedName |