[Macros] Miscellaneous build fixes for macros.

Author: DougGregor

lib/Refactoring/Refactoring.cpp

@@ -884,6 +884,7 @@ static void analyzeRenameScope(ValueDecl *VD, Optional<RenameRefInfo> RefInfo,
   case DeclContextKind::SerializedLocal:
   case DeclContextKind::Module:
   case DeclContextKind::FileUnit:
+  case DeclContextKind::MacroDecl:
     break;
   }
 
@@ -1074,6 +1075,7 @@ ExtractCheckResult checkExtractConditions(const ResolvedRangeInfo &RangeInfo,
   case swift::DeclContextKind::FileUnit:
   case swift::DeclContextKind::GenericTypeDecl:
   case swift::DeclContextKind::ExtensionDecl:
+  case swift::DeclContextKind::MacroDecl:
     return ExtractCheckResult();
   }
   return ExtractCheckResult(AllReasons);

lib/Sema/TypeCheckMacros.cpp

@@ -94,6 +94,8 @@ getMacroSignatureContextBuffer(
   return {buffer, len};
 }
 
+#if SWIFT_SWIFT_PARSER
+
 /// Compute the macro signature for a macro given the source code for its
 /// generic signature and type signature.
 static Optional<std::pair<GenericSignature, Type>>
@@ -290,6 +292,7 @@ static MacroDecl *createPluginMacro(
       mod, macroName, MacroDecl::ImplementationKind::Plugin, genSignature,
       typeSignature, owningModuleName, supplementalModuleNames, plugin);
 }
+#endif
 
 ArrayRef<MacroDecl *> MacroLookupRequest::evaluate(
     Evaluator &evaluator, Identifier macroName, ModuleDecl *mod

tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp

@@ -508,6 +508,7 @@ static bool initDocEntityInfo(const Decl *D,
     case DeclContextKind::SerializedLocal:
     case DeclContextKind::ExtensionDecl:
     case DeclContextKind::GenericTypeDecl:
+    case DeclContextKind::MacroDecl:
       break;
 
     // We report sub-module information only for top-level decls.

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -1217,6 +1217,7 @@ static Optional<AccessLevel> inferAccessSyntactically(const ValueDecl *D) {
     return AccessLevel::Private;
   case DeclContextKind::Module:
   case DeclContextKind::FileUnit:
+  case DeclContextKind::MacroDecl:
     return AccessLevel::Internal;
   case DeclContextKind::GenericTypeDecl: {
     auto generic = cast<GenericTypeDecl>(DC);

tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp

@@ -412,6 +412,7 @@ UIdent SwiftLangSupport::getUIDForCodeCompletionDeclKind(
     case CodeCompletionDeclKind::InstanceVar: return KindRefVarInstance;
     case CodeCompletionDeclKind::LocalVar: return KindRefVarLocal;
     case CodeCompletionDeclKind::GlobalVar: return KindRefVarGlobal;
+      case CodeCompletionDeclKind::Macro: return KindRefMacro;
     }
   }
 
@@ -440,6 +441,7 @@ UIdent SwiftLangSupport::getUIDForCodeCompletionDeclKind(
   case CodeCompletionDeclKind::InstanceVar: return KindDeclVarInstance;
   case CodeCompletionDeclKind::LocalVar: return KindDeclVarLocal;
   case CodeCompletionDeclKind::GlobalVar: return KindDeclVarGlobal;
+  case CodeCompletionDeclKind::Macro: return KindDeclMacro;
   }
 
   llvm_unreachable("Unhandled CodeCompletionDeclKind in switch.");

utils/gyb_sourcekit_support/UIDs.py

@@ -371,6 +371,8 @@ def __init__(self, internal_name, external_name):
     KIND('RefTypeAlias', 'source.lang.swift.ref.typealias'),
     KIND('DeclGenericTypeParam', 'source.lang.swift.decl.generic_type_param'),
     KIND('RefGenericTypeParam', 'source.lang.swift.ref.generic_type_param'),
+    KIND('DeclMacro', 'source.lang.swift.decl.macro'),
+    KIND('RefMacro', 'source.lang.swift.ref.macro'),
     KIND('RefModule', 'source.lang.swift.ref.module'),
     KIND('CommentTag', 'source.lang.swift.commenttag'),
     KIND('StmtForEach', 'source.lang.swift.stmt.foreach'),