[Completion] NFC: Factor out addMacroCallArguments

Author: hamishknight

include/swift/IDE/CompletionLookup.h

@@ -458,6 +458,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
   void addEnumElementRef(const EnumElementDecl *EED, DeclVisibilityKind Reason,
                          DynamicLookupInfo dynamicLookupInfo,
                          bool HasTypeContext);
+  void addMacroCallArguments(const MacroDecl *MD, DeclVisibilityKind Reason);
   void addMacroExpansion(const MacroDecl *MD, DeclVisibilityKind Reason);
 
   void addKeyword(

lib/IDE/CompletionLookup.cpp

@@ -1946,22 +1946,8 @@ static StringRef getTypeAnnotationString(const MacroDecl *MD,
   return {stash.data(), stash.size()};
 }
 
-void CompletionLookup::addMacroExpansion(const MacroDecl *MD,
-                                         DeclVisibilityKind Reason) {
-  if (!MD->hasName() || !MD->isAccessibleFrom(CurrDeclContext) ||
-      MD->shouldHideFromEditor())
-    return;
-
-  OptionSet<CustomAttributeKind> expectedKinds =
-      expectedTypeContext.getExpectedCustomAttributeKinds();
-  if (expectedKinds) {
-    CodeCompletionMacroRoles expectedRoles =
-        getCompletionMacroRoles(expectedKinds);
-    CodeCompletionMacroRoles roles = getCompletionMacroRoles(MD);
-    if (!(roles & expectedRoles))
-      return;
-  }
-
+void CompletionLookup::addMacroCallArguments(const MacroDecl *MD,
+                                             DeclVisibilityKind Reason) {
   CodeCompletionResultBuilder Builder =
       makeResultBuilder(CodeCompletionResultKind::Declaration,
                         getSemanticContext(MD, Reason, DynamicLookupInfo()));
@@ -1988,6 +1974,25 @@ void CompletionLookup::addMacroExpansion(const MacroDecl *MD,
   }
 }
 
+void CompletionLookup::addMacroExpansion(const MacroDecl *MD,
+                                         DeclVisibilityKind Reason) {
+  if (!MD->hasName() || !MD->isAccessibleFrom(CurrDeclContext) ||
+      MD->shouldHideFromEditor())
+    return;
+
+  OptionSet<CustomAttributeKind> expectedKinds =
+      expectedTypeContext.getExpectedCustomAttributeKinds();
+  if (expectedKinds) {
+    CodeCompletionMacroRoles expectedRoles =
+        getCompletionMacroRoles(expectedKinds);
+    CodeCompletionMacroRoles roles = getCompletionMacroRoles(MD);
+    if (!(roles & expectedRoles))
+      return;
+  }
+
+  addMacroCallArguments(MD, Reason);
+}
+
 void CompletionLookup::addKeyword(StringRef Name, Type TypeAnnotation,
                                   SemanticContextKind SK,
                                   CodeCompletionKeywordKind KeyKind,