Merge pull request #19741 from nkcsgexi/property-observer-module-digester

Author: swift-ci

include/swift/IDE/DigesterEnums.def

@@ -129,6 +129,8 @@ KEY_BOOL(IsLet, isLet)
 KEY_BOOL(IsOpen, isOpen)
 KEY_BOOL(IsInternal, isInternal)
 KEY_BOOL(HasStorage, hasStorage)
+KEY_BOOL(HasDidset, hasDidset)
+KEY_BOOL(HasWillset, hasWillset)
 
 KEY(kind)
 

test/api-digester/Inputs/cake.swift

@@ -47,7 +47,7 @@ public extension Int {
 @_fixed_layout
 public struct fixedLayoutStruct {
   public var a = 1
-  private var b = 2
+  private var b = 2 { didSet {} willSet(value) {} }
   var c = 3
   @available(*, unavailable)
   public let unavailableProperty = 1

test/api-digester/Outputs/cake-abi.json

@@ -803,7 +803,9 @@
             "HasInitialValue"
           ],
           "fixedbinaryorder": 1,
-          "hasStorage": true
+          "hasStorage": true,
+          "hasDidset": true,
+          "hasWillset": true
         },
         {
           "kind": "Var",

tools/swift-api-digester/ModuleAnalyzerNodes.cpp

@@ -112,7 +112,8 @@ SDKNodeDeclTypeAlias::SDKNodeDeclTypeAlias(SDKNodeInitInfo Info):
 SDKNodeDeclVar::SDKNodeDeclVar(SDKNodeInitInfo Info): 
   SDKNodeDecl(Info, SDKNodeKind::DeclVar),
   FixedBinaryOrder(Info.FixedBinaryOrder), IsLet(Info.IsLet),
-  HasStorage(Info.HasStorage) {}
+  HasStorage(Info.HasStorage), HasDidSet(Info.HasDidset),
+  HasWillSet(Info.HasWillset) {}
 
 SDKNodeDeclAbstractFunc::SDKNodeDeclAbstractFunc(SDKNodeInitInfo Info,
   SDKNodeKind Kind): SDKNodeDecl(Info, Kind), IsThrowing(Info.IsThrowing),
@@ -136,7 +137,8 @@ SDKNodeDeclAssociatedType::SDKNodeDeclAssociatedType(SDKNodeInitInfo Info):
 
 SDKNodeDeclSubscript::SDKNodeDeclSubscript(SDKNodeInitInfo Info):
   SDKNodeDeclAbstractFunc(Info, SDKNodeKind::DeclSubscript),
-  HasSetter(Info.HasSetter), HasStorage(Info.HasStorage) {}
+  HasSetter(Info.HasSetter), HasStorage(Info.HasStorage),
+  HasDidSet(Info.HasDidset), HasWillSet(Info.HasWillset) {}
 
 StringRef SDKNodeDecl::getHeaderName() const {
   if (Location.empty())
@@ -1111,6 +1113,8 @@ SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, ValueDecl *VD)
 
   if (auto *VAR = dyn_cast<AbstractStorageDecl>(VD)) {
     HasStorage = VAR->hasStorage();
+    HasDidset = VAR->getDidSetFunc();
+    HasWillset = VAR->getWillSetFunc();
   }
 }
 
@@ -1541,13 +1545,17 @@ void SDKNodeDeclSubscript::jsonize(json::Output &out) {
   SDKNodeDeclAbstractFunc::jsonize(out);
   output(out, KeyKind::KK_hasSetter, HasSetter);
   output(out, KeyKind::KK_hasStorage, HasStorage);
+  output(out, KeyKind::KK_hasDidset, HasDidSet);
+  output(out, KeyKind::KK_hasWillset, HasWillSet);
 }
 
 void SDKNodeDeclVar::jsonize(json::Output &out) {
   SDKNodeDecl::jsonize(out);
   out.mapOptional(getKeyContent(Ctx, KeyKind::KK_fixedbinaryorder).data(), FixedBinaryOrder);
   output(out, KeyKind::KK_isLet, IsLet);
   output(out, KeyKind::KK_hasStorage, HasStorage);
+  output(out, KeyKind::KK_hasDidset, HasDidSet);
+  output(out, KeyKind::KK_hasWillset, HasWillSet);
 }
 
 namespace swift {

tools/swift-api-digester/ModuleAnalyzerNodes.h

@@ -497,6 +497,8 @@ class SDKNodeDeclVar : public SDKNodeDecl {
   Optional<uint8_t> FixedBinaryOrder;
   bool IsLet;
   bool HasStorage;
+  bool HasDidSet;
+  bool HasWillSet;
 public:
   SDKNodeDeclVar(SDKNodeInitInfo Info);
   static bool classof(const SDKNode *N);
@@ -509,6 +511,8 @@ class SDKNodeDeclVar : public SDKNodeDecl {
   void jsonize(json::Output &Out) override;
   void diagnose(SDKNode *Right) override;
   bool hasStorage() const { return HasStorage; }
+  bool hasDidSet() const { return HasDidSet; }
+  bool hasWillSet() const { return HasWillSet; }
 };
 
 class SDKNodeDeclAbstractFunc : public SDKNodeDecl {
@@ -532,13 +536,17 @@ class SDKNodeDeclAbstractFunc : public SDKNodeDecl {
 class SDKNodeDeclSubscript: public SDKNodeDeclAbstractFunc {
   bool HasSetter;
   bool HasStorage;
+  bool HasDidSet;
+  bool HasWillSet;
 public:
   SDKNodeDeclSubscript(SDKNodeInitInfo Info);
   static bool classof(const SDKNode *N);
   bool hasSetter() const { return HasSetter; }
   bool hasStorage() const { return HasStorage; }
   void jsonize(json::Output &Out) override;
   void diagnose(SDKNode *Right) override;
+  bool hasDidSet() const { return HasDidSet; }
+  bool hasWillSet() const { return HasWillSet; }
 };
 
 class SDKNodeDeclFunction: public SDKNodeDeclAbstractFunc {