[cfe-commits] r111830 - in /cfe/trunk/lib: Frontend/ASTUnit.cpp Sema/SemaCodeComplete.cpp

[Douglas Gregor]

Author: dgregor
Date: Mon Aug 23 14:33:40 2010
New Revision: 111830

URL: http://llvm.org/viewvc/llvm-project?rev=111830&view=rev
Log:
Don't include macro results when we're completing a declarator.

Modified:
    cfe/trunk/lib/Frontend/ASTUnit.cpp
    cfe/trunk/lib/Sema/SemaCodeComplete.cpp

Modified: cfe/trunk/lib/Frontend/ASTUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ASTUnit.cpp?rev=111830&r1=111829&r2=111830&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/ASTUnit.cpp (original)
+++ cfe/trunk/lib/Frontend/ASTUnit.cpp Mon Aug 23 14:33:40 2010
@@ -276,9 +276,7 @@
         | (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;

Modified: cfe/trunk/lib/Sema/SemaCodeComplete.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaCodeComplete.cpp?rev=111830&r1=111829&r2=111830&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaCodeComplete.cpp (original)
+++ cfe/trunk/lib/Sema/SemaCodeComplete.cpp Mon Aug 23 14:33:40 2010
@@ -2296,10 +2296,6 @@
   }
   Results.ExitScope();
 
-  // Allow macros for names.
-  if (CodeCompleter->includeMacros())
-    AddMacroResults(PP, Results);
-  
   HandleCodeCompleteResults(this, CodeCompleter,
                         AllowNestedNameSpecifiers
                           ? CodeCompletionContext::CCC_PotentiallyQualifiedName