Merge branch 'mwf/generic-parent-item' of https://github.com/microsof…

…t/vscode-azuretools into mwf/activity-log-nesting
microsoft · Nov 30, 2023 · 1a93436 · 1a93436
2 parents 8879f38 + caa488c
commit 1a93436
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/utils/src/tree/AzExtTreeItem.ts b/utils/src/tree/AzExtTreeItem.ts
@@ -52,7 +52,14 @@ export abstract class AzExtTreeItem implements types.AzExtTreeItem {
             return undefined;
         }
 
-        if (this.parent && this.treeDataProvider.collapsibleStateTracker) {
+        /**
+         * Reference: https://github.com/microsoft/vscode-azuretools/pull/1635/files#r1408222203
+         *
+         * `GenericParentTreeItem` has the option to be defined without a parent or tree data provider (for example, when utilized for the activity log)
+         * To avoid `nonNull` errors from being thrown, don't call the getter for `treeDataProvider` if none of the associated fields are populated.
+         */
+        const hasTreeDataProvider: boolean = !!this._treeDataProvider || !!this.parent?.treeDataProvider;
+        if (hasTreeDataProvider && this.treeDataProvider.collapsibleStateTracker) {
             return this.treeDataProvider.collapsibleStateTracker.getCollapsibleState(this);
         }