Overload method AbstractTreeViewer::internalConditionalExpandToLevel

Author: fedejeanne

bundles/org.eclipse.jface/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface;singleton:=true
-Bundle-Version: 3.36.0.qualifier
+Bundle-Version: 3.37.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jface,

bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java

@@ -1850,6 +1850,19 @@ protected Widget internalGetWidgetToSelect(Object elementOrTreePath) {
 	 */
 	private void internalConditionalExpandToLevel(Widget widget, int level,
 			Function<Widget, Boolean> shouldChildrenExpand) {
+		internalConditionalExpandToLevel(widget, level, __ -> Boolean.TRUE, shouldChildrenExpand);
+	}
+
+	/**
+	 * Same as
+	 * {@link #internalConditionalExpandToLevel(Widget, int, Function, Function)}i
+	 *
+	 * @param shouldWidgetExpand evaluates if the widget itself needs to be
+	 *                           expanded.
+	 * @since 3.37
+	 */
+	protected void internalConditionalExpandToLevel(Widget widget, int level,
+			Function<Widget, Boolean> shouldWidgetExpand, Function<Widget, Boolean> shouldChildrenExpand) {
 		if (level == ALL_LEVELS || level > 0) {
 			Object data = widget.getData();
 			if (widget instanceof Item it && data != null && !isExpandable(it, null, data)) {
@@ -1858,6 +1871,10 @@ private void internalConditionalExpandToLevel(Widget widget, int level,
 			createChildren(widget, false);
 			// XXX for performance widget should be expanded after expanding children:
 			if (widget instanceof Item it) {
+				if (!shouldWidgetExpand.apply(widget).booleanValue()) {
+					return;
+				}
+
 				setExpanded(it, true);
 			}
 			if (level == ALL_LEVELS || level > 1) {