From f8c76a8e487abb702e752275993a70ed58356cf0 Mon Sep 17 00:00:00 2001
From: Zsombor Gegesy <gzsombor@gmail.com>
Date: Fri, 28 Mar 2025 23:54:21 +0100
Subject: [PATCH] Do not collapse single frames under GroupedStackFrame

---
 .../debug/ui/monitors/JavaThreadContentProvider.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaThreadContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaThreadContentProvider.java
index 37ac9d105d..4330b737a1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaThreadContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/JavaThreadContentProvider.java
@@ -156,12 +156,18 @@ private List<IDebugElement> getStackFrames(IJavaThread thread) throws DebugExcep
 				if (frame instanceof JDIStackFrame javaFrame) {
 					var category = javaFrame.getCategory();
 					if (category == null || !category.hideWhenCollapse()) {
+						if (lastGroupping != null) {
+							if (lastGroupping.getFrameCount() > 1) {
+								result.add(lastGroupping);
+							} else {
+								result.add(lastGroupping.getTopMostFrame());
+							}
+						}
 						result.add(javaFrame);
 						lastGroupping = null;
 					} else {
 						if (lastGroupping == null) {
 							lastGroupping = new GroupedStackFrame(javaFrame.getJavaDebugTarget());
-							result.add(lastGroupping);
 						}
 						lastGroupping.add(javaFrame);
 					}
@@ -170,6 +176,9 @@ private List<IDebugElement> getStackFrames(IJavaThread thread) throws DebugExcep
 				}
 			}
 		}
+		if (lastGroupping != null) {
+			result.add(lastGroupping);
+		}
 		return result;
 	}