Merge branch 'master' into feature/uc_component_removal

project-chip · Sep 13, 2023 · 76d4e81 · 76d4e81
2 parents 377bf74 + 9881ae9
commit 76d4e81
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src-electron/generator/matter/darwin/Framework/CHIP/templates/helper.js b/src-electron/generator/matter/darwin/Framework/CHIP/templates/helper.js
@@ -897,7 +897,25 @@ function isSupported(cluster, options) {
 function isProvisional(cluster, options) {
   let provisionalRelease = findReleaseForPathOrAncestorAndSection(this.global, cluster, options, 'provisional');
   if (provisionalRelease === undefined) {
-    return false;
+    // For attributes, also check whether this is a provisional global
+    // attribute.
+    let attrName = options.hash.attribute;
+    if (attrName) {
+      provisionalRelease = findReleaseForPathOrAncestorAndSection(
+        this.global,
+        /* cluster does not apply to global attributes */
+        "",
+        /*
+         * Keep our options (e.g. in terms of isForIds bits), but replace
+         * attribute with globalAttribute.
+         */
+        { hash: { ...options.hash, attribute: undefined, globalAttribute: attrName } },
+        'provisional'
+      );
+    }
+    if (provisionalRelease === undefined) {
+      return false;
+    }
   }
 
   let path = makeAvailabilityPath(cluster, options);