Merge pull request swiftlang#63594 from DougGregor/sourcekit-attached-macros

Author: DougGregor

include/swift/AST/ASTWalker.h

@@ -24,6 +24,7 @@ class ArgumentList;
 class Decl;
 class Expr;
 class ClosureExpr;
+class CustomAttr;
 class ModuleDecl;
 class Stmt;
 class Pattern;
@@ -46,9 +47,17 @@ struct ReferenceMetaData {
   SemaReferenceKind Kind;
   llvm::Optional<AccessKind> AccKind;
   bool isImplicit = false;
-  ReferenceMetaData(SemaReferenceKind Kind, llvm::Optional<AccessKind> AccKind,
-                    bool isImplicit = false)
-      : Kind(Kind), AccKind(AccKind), isImplicit(isImplicit) {}
+
+  /// When non-none, this is a custom attribute reference.
+  Optional<std::pair<const CustomAttr *, Decl *>> CustomAttrRef;
+
+  ReferenceMetaData(
+      SemaReferenceKind Kind, llvm::Optional<AccessKind> AccKind,
+      bool isImplicit = false,
+      Optional<std::pair<const CustomAttr *, Decl *>> customAttrRef
+        = None
+  ) : Kind(Kind), AccKind(AccKind), isImplicit(isImplicit),
+      CustomAttrRef(customAttrRef) {}
 };
 
 /// Specifies how the initialization expression of a \c lazy variable should be

include/swift/AST/TypeCheckRequests.h

@@ -3825,36 +3825,60 @@ class ExpandMacroExpansionDeclRequest
   bool isCached() const { return true; }
 };
 
+/// Expand all accessor macros attached to the given declaration.
+///
+/// Produces the set of macro expansion buffer IDs.
+class ExpandAccessorMacros
+    : public SimpleRequest<ExpandAccessorMacros,
+                           ArrayRef<unsigned>(AbstractStorageDecl *),
+                           RequestFlags::Cached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  ArrayRef<unsigned> evaluate(
+      Evaluator &evaluator, AbstractStorageDecl *storage) const;
+
+public:
+  bool isCached() const { return true; }
+};
+
 /// Expand all member attribute macros attached to the given
 /// declaration.
+///
+/// Produces the set of macro expansion buffer IDs.
 class ExpandMemberAttributeMacros
     : public SimpleRequest<ExpandMemberAttributeMacros,
-                           bool(Decl *),
+                           ArrayRef<unsigned>(Decl *),
                            RequestFlags::Cached> {
 public:
   using SimpleRequest::SimpleRequest;
 
 private:
   friend SimpleRequest;
 
-  bool evaluate(Evaluator &evaluator, Decl *decl) const;
+  ArrayRef<unsigned> evaluate(Evaluator &evaluator, Decl *decl) const;
 
 public:
   bool isCached() const { return true; }
 };
 
 /// Expand synthesized member macros attached to the given declaration.
+///
+/// Produces the set of macro expansion buffer IDs.
 class ExpandSynthesizedMemberMacroRequest
     : public SimpleRequest<ExpandSynthesizedMemberMacroRequest,
-                           bool(Decl *),
+                           ArrayRef<unsigned>(Decl *),
                            RequestFlags::Cached> {
 public:
   using SimpleRequest::SimpleRequest;
 
 private:
   friend SimpleRequest;
 
-  bool evaluate(Evaluator &evaluator, Decl *decl) const;
+  ArrayRef<unsigned> evaluate(Evaluator &evaluator, Decl *decl) const;
 
 public:
   bool isCached() const { return true; }
@@ -3887,15 +3911,15 @@ class CompilerPluginLoadRequest
 /// Expand peer macros attached to the given declaration.
 class ExpandPeerMacroRequest
     : public SimpleRequest<ExpandPeerMacroRequest,
-                           bool(Decl *),
+                           ArrayRef<unsigned>(Decl *),
                            RequestFlags::Cached> {
 public:
   using SimpleRequest::SimpleRequest;
 
 private:
   friend SimpleRequest;
 
-  bool evaluate(Evaluator &evaluator, Decl *decl) const;
+  ArrayRef<unsigned> evaluate(Evaluator &evaluator, Decl *decl) const;
 
 public:
   bool isCached() const { return true; }

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -432,10 +432,13 @@ SWIFT_REQUEST(TypeChecker, ExpandMacroExpansionDeclRequest,
               ArrayRef<Decl *>(MacroExpansionDecl *),
               Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ExpandMemberAttributeMacros,
-              bool(Decl *),
+              ArrayRef<unsigned>(Decl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeCHecker, ExpandSynthesizedMemberMacroRequest,
-              bool(Decl *),
+SWIFT_REQUEST(TypeChecker, ExpandAccessorMacros,
+              ArrayRef<unsigned>(AbstractStorageDecl *),
+              Cached, NoLocationInfo)
+SWIFT_REQUEST(TypeChecker, ExpandSynthesizedMemberMacroRequest,
+              ArrayRef<unsigned>(Decl *),
               Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ExpandPeerMacroRequest,
               bool(Decl *),

include/swift/Basic/SourceManager.h

@@ -63,12 +63,12 @@ class GeneratedSourceInfo {
   /// which source code was generated. Conceptually, one can think of the
   /// buffer described by a \c GeneratedSource instance as replacing the
   /// code in the \c originalSourceRange.
-  SourceRange originalSourceRange;
+  CharSourceRange originalSourceRange;
 
   /// The source range in the generated-source buffer where the generated
   /// code exists. This might be a subrange of the buffer containing the
   /// generated source, but it will never be from a different buffer.
-  SourceRange generatedSourceRange;
+  CharSourceRange generatedSourceRange;
 
   /// The opaque pointer for an ASTNode for which this buffer was generated.
   void *astNode;

include/swift/IDE/Utils.h

@@ -151,6 +151,8 @@ struct ResolvedCursorInfo {
     bool IsRef = true;
     Type Ty;
     Type ContainerType;
+    Optional<std::pair<const CustomAttr *, Decl *>> CustomAttrRef = None;
+
     bool IsKeywordArgument = false;
     /// It this is a ref, whether it is "dynamic". See \c ide::isDynamicRef.
     bool IsDynamic = false;
@@ -262,6 +264,13 @@ struct ResolvedValueRefCursorInfo : public ResolvedCursorInfo {
                                   : ValueRefInfo.ValueD;
   }
 
+  Optional<std::pair<const CustomAttr *, Decl *>> getCustomAttrRef() const {
+    return ValueRefInfo.CustomAttrRef;
+  }
+  void setCustomAttrRef(Optional<std::pair<const CustomAttr *, Decl *>> ref) {
+    ValueRefInfo.CustomAttrRef = ref;
+  }
+
   static bool classof(const ResolvedCursorInfo *Info) {
     return Info->getKind() == CursorInfoKind::ValueRef;
   }

lib/AST/ASTScopeLookup.cpp

@@ -127,13 +127,16 @@ ASTScopeImpl::findChildContaining(SourceLoc loc,
           // A map from enclosing source files to original source ranges of the macro
           // expansions within that file, recording the chain of macro expansions for
           // the given scope.
-          llvm::SmallDenseMap<const SourceFile *, SourceRange> scopeExpansions;
+          llvm::SmallDenseMap<const SourceFile *, CharSourceRange>
+              scopeExpansions;
 
           // Walk up the chain of macro expansion buffers for the scope, recording the
           // original source range of the macro expansion along the way using generated
           // source info.
           auto *scopeExpansion = scopeSourceFile;
-          scopeExpansions[scopeExpansion] = scope->getSourceRangeOfThisASTNode();
+          scopeExpansions[scopeExpansion] =
+              Lexer::getCharSourceRangeFromSourceRange(
+                sourceMgr, scope->getSourceRangeOfThisASTNode());
           while (auto *ancestor = scopeExpansion->getEnclosingSourceFile()) {
             auto generatedInfo =
                 sourceMgr.getGeneratedSourceInfo(*scopeExpansion->getBufferID());
@@ -150,15 +153,14 @@ ASTScopeImpl::findChildContaining(SourceLoc loc,
             if (scopeExpansion != scopeExpansions.end()) {
               // Take the original expansion range within the LCA of the loc and
               // the scope to compare.
-              rangeOfScope =
-                  Lexer::getCharSourceRangeFromSourceRange(sourceMgr, scopeExpansion->second);
+              rangeOfScope = scopeExpansion->second;
               loc = expansionLoc;
               break;
             }
 
             auto generatedInfo =
                 sourceMgr.getGeneratedSourceInfo(*potentialLCA->getBufferID());
-            expansionLoc = generatedInfo->originalSourceRange.Start;
+            expansionLoc = generatedInfo->originalSourceRange.getStart();
             potentialLCA = potentialLCA->getEnclosingSourceFile();
           }
         }

lib/AST/ASTScopeSourceRange.cpp

@@ -75,12 +75,11 @@ void ASTScopeImpl::checkSourceRangeBeforeAddingChild(ASTScopeImpl *child,
     if (!generatedInfo)
       return false;
 
-    SourceRange expansionRange = generatedInfo->originalSourceRange;
+    CharSourceRange expansionRange = generatedInfo->originalSourceRange;
     if (expansionRange.isInvalid())
       return false;
 
-    return containedInParent(
-        Lexer::getCharSourceRangeFromSourceRange(sourceMgr, expansionRange));
+    return containedInParent(expansionRange);
   };
 
   auto childCharRange = child->getCharSourceRangeOfScope(sourceMgr);

lib/AST/Decl.cpp

@@ -369,9 +369,9 @@ StringRef Decl::getDescriptiveKindName(DescriptiveDeclKind K) {
 
 DeclAttributes Decl::getSemanticAttrs() const {
   auto mutableThis = const_cast<Decl *>(this);
-  evaluateOrDefault(getASTContext().evaluator,
-                    ExpandMemberAttributeMacros{mutableThis},
-                    false);
+  (void)evaluateOrDefault(getASTContext().evaluator,
+                          ExpandMemberAttributeMacros{mutableThis},
+                          { });
 
   return getAttrs();
 }

lib/AST/DiagnosticEngine.cpp

@@ -1241,11 +1241,8 @@ DiagnosticEngine::diagnosticInfoForDiagnostic(const Diagnostic &diagnostic) {
             bufferID,
             GeneratedSourceInfo{
               GeneratedSourceInfo::PrettyPrinted,
-              SourceRange(),
-              SourceRange(
-                  memBufferStartLoc,
-                  memBufferStartLoc.getAdvancedLoc(buffer.size())
-              ),
+              CharSourceRange(),
+              CharSourceRange(memBufferStartLoc, buffer.size()),
               ASTNode(const_cast<Decl *>(ppDecl)).getOpaqueValue(),
               nullptr
             }

lib/AST/NameLookup.cpp

@@ -2082,9 +2082,9 @@ QualifiedLookupRequest::evaluate(Evaluator &eval, const DeclContext *DC,
 
     // Expand synthesized member macros.
     auto &ctx = current->getASTContext();
-    evaluateOrDefault(ctx.evaluator,
-                      ExpandSynthesizedMemberMacroRequest{current},
-                      false);
+    (void)evaluateOrDefault(ctx.evaluator,
+                            ExpandSynthesizedMemberMacroRequest{current},
+                            false);
 
     // Look for results within the current nominal type and its extensions.
     bool currentIsProtocol = isa<ProtocolDecl>(current);