[Code completion] Don't include non-freestanding macros in results.

Author: DougGregor

lib/IDE/CompletionLookup.cpp

@@ -1783,7 +1783,8 @@ void CompletionLookup::addEnumElementRef(const EnumElementDecl *EED,
 void CompletionLookup::addMacroExpansion(const MacroDecl *MD,
                                          DeclVisibilityKind Reason) {
   if (!MD->hasName() || !MD->isAccessibleFrom(CurrDeclContext) ||
-      MD->shouldHideFromEditor())
+      MD->shouldHideFromEditor() ||
+      !isFreestandingMacro(MD->getMacroRoles()))
     return;
 
   CodeCompletionResultBuilder Builder(