Skip to content

[TBB] Thinking block UI improvements: Label title, collapse timing, height cap, and section parsing fix #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdneo merged 6 commits into from
May 14, 2026
Merged

[TBB] Thinking block UI improvements: Label title, collapse timing, height cap, and section parsing fix #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4eb2f3
change thinking title to label and fix cancelled issue
xinyi-gong May 14, 2026
3b16641
setExpand(false) when thinking chunk completed
xinyi-gong May 14, 2026
fbedc86
fix: require line-start anchor in thinking section title pattern to p…
xinyi-gong May 14, 2026
10ef456
feat: cap thinking body height during streaming with ScrolledComposit…
xinyi-gong May 14, 2026
599bdd2
fix: call markSealed before showCompleted when language server is null
xinyi-gong May 14, 2026
136c85b
resolve comments
xinyi-gong May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions ...lot.eclipse.ui.test/src/com/microsoft/copilot/eclipse/ui/chat/ThinkingBlockParseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,49 @@ void parseSections_handlesLfOnlyTitleBoundary() throws Exception {
assertEquals("plan body", body(sections.get(1)));
}

@Test
void parseSections_inlineBoldNotTreatedAsTitle() throws Exception {
// Inline bold at end of string should NOT be parsed as a section title.
String raw = "combined with **The Ship of Theseus**";
List<?> sections = invokeParseSections(raw);
assertEquals(1, sections.size());
assertNull(title(sections.get(0)));
assertEquals("combined with **The Ship of Theseus**", body(sections.get(0)));
}

@Test
void parseSections_inlineBoldFollowedByText() throws Exception {
// Inline bold mid-line should remain as body text.
String raw = "text with **bold** and more text";
List<?> sections = invokeParseSections(raw);
assertEquals(1, sections.size());
assertNull(title(sections.get(0)));
assertEquals("text with **bold** and more text", body(sections.get(0)));
}

@Test
void parseSections_mixOfInlineBoldAndStandaloneTitle() throws Exception {
// Inline bold on one line, standalone title on next line.
String raw = "text with **inline bold** here\n**Standalone Title**\nbody after title";
List<?> sections = invokeParseSections(raw);
assertEquals(2, sections.size());
assertNull(title(sections.get(0)));
assertEquals("text with **inline bold** here", body(sections.get(0)));
assertEquals("Standalone Title", title(sections.get(1)));
assertEquals("body after title", body(sections.get(1)));
}

@Test
void parseSections_titleAtStartOfText() throws Exception {
String raw = "**First**\nbody one\n**Second**\nbody two";
List<?> sections = invokeParseSections(raw);
assertEquals(2, sections.size());
assertEquals("First", title(sections.get(0)));
assertEquals("body one", body(sections.get(0)));
assertEquals("Second", title(sections.get(1)));
assertEquals("body two", body(sections.get(1)));
}

private static String invokeStripTrailingNewlines(String input) throws Exception {
Method m = ThinkingBlock.class.getDeclaredMethod("stripTrailingNewlines", String.class);
m.setAccessible(true);
Expand Down
155 changes: 110 additions & 45 deletions ...microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ThinkingBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.apache.commons.lang3.StringUtils;
import org.eclipse.e4.ui.services.IStylingEngine;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.graphics.Cursor;
Expand All @@ -23,6 +23,8 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.PlatformUI;

import com.microsoft.copilot.eclipse.ui.CopilotUi;
import com.microsoft.copilot.eclipse.ui.chat.services.ChatServiceManager;
import com.microsoft.copilot.eclipse.ui.swt.SpinnerAnimator;
import com.microsoft.copilot.eclipse.ui.utils.UiUtils;

Expand All @@ -34,19 +36,25 @@
*/
public class ThinkingBlock extends Composite {
private static final String SECONDARY_TEXT_CSS_CLASS = "text-secondary";
private static final Pattern TITLE_PATTERN = Pattern.compile("\\*\\*([^*\\r\\n]+?)\\*\\*(?=\\r?\\n|$)");
private static final Pattern TITLE_PATTERN =
Pattern.compile("(?:^|\\n)\\*\\*([^*\\r\\n]+?)\\*\\*(?=\\r?\\n|$)");

private static final int STREAMING_MAX_HEIGHT = 180;
Comment thread
xinyi-gong marked this conversation as resolved.

private Composite header;
private GridLayout headerLayout;
private Label iconLabel;
private ChatMarkupViewer titleViewer;
private Label titleLabel;
private Label chevronLabel;

/** Body container holding one {@link ThinkingSection} per parsed section. Hidden when collapsed. */
/** Scrollable wrapper around {@link #body}; used only during streaming. Disposed on finalized expand. */
Comment thread
xinyi-gong marked this conversation as resolved.
private ScrolledComposite bodyScroller;
/** Body container holding one {@link ThinkingSection} per parsed section. */
private Composite body;
private final List<ThinkingSection> sections = new ArrayList<>();
private final StringBuilder textBuffer = new StringBuilder();
private boolean expanded = true;
/** Auto-scroll to bottom during streaming. Turned off on any user scroll interaction. */
private boolean autoScroll = true;

/**
* Lifecycle of the block. Transitions are always forward: STREAMING → (SEALED →)? → COMPLETED|CANCELLED.
Expand Down Expand Up @@ -94,7 +102,7 @@ public void appendText(String fragment) {
requestLayout();
}

/** Hide the icon, set the title, and collapse. No-op if already finalized. Spinner was already stopped at SEALED. */
/** Update the title and finalize as completed. Block was already collapsed at seal time. */
public void showCompleted(String title) {
if (isFinalized()) {
return;
Expand All @@ -106,7 +114,6 @@ public void showCompleted(String title) {
iconLabel.requestLayout();
}
setTitleText(title);
setExpanded(false);
state = State.COMPLETED;
}

Expand All @@ -124,6 +131,7 @@ public void showCancelled() {
}
setTitleText(Messages.thinking_cancelledTitle);
setExpanded(false);
unwrapBodyFromScroller();
state = State.CANCELLED;
}

Expand All @@ -139,6 +147,8 @@ public void markSealed() {
state = State.SEALED;
stopSpinner();
setTitleText(Messages.thinking_completedTitle);
setExpanded(false);
unwrapBodyFromScroller();
}

/** True only while new thinking stream fragments should still be appended to this block. */
Expand Down Expand Up @@ -174,7 +184,7 @@ private void stopSpinner() {

private void createHeader() {
header = new Composite(this, SWT.NONE);
headerLayout = new GridLayout(4, false);
GridLayout headerLayout = new GridLayout(4, false);
headerLayout.marginHeight = 0;
headerLayout.marginWidth = 0;
// Match AgentStatusLabel's icon-to-text spacing for visual consistency.
Expand All @@ -185,16 +195,14 @@ private void createHeader() {
iconLabel = new Label(header, SWT.NONE);
iconLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));

// Title: no grab so the chevron can sit immediately after it; widthHint is recomputed on
// resize so SWT.WRAP kicks in when the title would otherwise overflow.
titleViewer = new ChatMarkupViewer(header, SWT.LEFT | SWT.WRAP);
StyledText titleText = titleViewer.getTextWidget();
GridData titleData = new GridData(SWT.LEFT, SWT.CENTER, false, false);
titleText.setLayoutData(titleData);
titleText.setEditable(false);
// Strip StyledText's intrinsic margins so the text sits flush with the adjacent labels.
titleText.setMargins(0, 0, 0, 0);
UiUtils.applyCssClass(titleText, SECONDARY_TEXT_CSS_CLASS, stylingEngine);
titleLabel = new Label(header, SWT.LEFT | SWT.WRAP);
titleLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
UiUtils.applyCssClass(titleLabel, SECONDARY_TEXT_CSS_CLASS, stylingEngine);

ChatServiceManager chatServiceManager = CopilotUi.getPlugin().getChatServiceManager();
if (chatServiceManager != null) {
chatServiceManager.getChatFontService().registerControl(titleLabel);
}

chevronLabel = new Label(header, SWT.NONE);
chevronLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
Expand All @@ -205,11 +213,11 @@ private void createHeader() {

Cursor handCursor = getDisplay().getSystemCursor(SWT.CURSOR_HAND);
header.setCursor(handCursor);
titleText.setCursor(handCursor);
titleLabel.setCursor(handCursor);
chevronLabel.setCursor(handCursor);

// Constrain the title's width so SWT.WRAP can take effect once the parent is narrower than
// the natural single-line width of the markup.
// Constrain the title's width so SWT.WRAP can take effect when the header is narrower than
// the natural single-line width of the title.
header.addListener(SWT.Resize, e -> updateTitleWidthHint());

MouseAdapter toggleListener = new MouseAdapter() {
Expand All @@ -222,20 +230,32 @@ public void mouseUp(MouseEvent e) {
// cursor is actually clickable. iconLabel is intentionally excluded: it hosts the live spinner
// animation (and the cancel icon afterwards), and a clickable spinner is an odd affordance.
header.addMouseListener(toggleListener);
titleText.addMouseListener(toggleListener);
titleLabel.addMouseListener(toggleListener);
chevronLabel.addMouseListener(toggleListener);
filler.addMouseListener(toggleListener);
}

private void createBody() {
body = new Composite(this, SWT.NONE);
bodyScroller = new ScrolledComposite(this, SWT.V_SCROLL);
bodyScroller.setExpandHorizontal(true);
bodyScroller.setExpandVertical(true);
bodyScroller.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
bodyScroller.setAlwaysShowScrollBars(false);

body = new Composite(bodyScroller, SWT.NONE);
GridLayout bodyLayout = new GridLayout(1, false);
bodyLayout.marginHeight = 4;
bodyLayout.marginLeft = 4;
bodyLayout.marginWidth = 0;
bodyLayout.verticalSpacing = 6;
body.setLayout(bodyLayout);
body.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

bodyScroller.setContent(body);

// Any user scroll interaction disables auto-scroll unconditionally.
Runnable disableAutoScroll = () -> autoScroll = false;
bodyScroller.getVerticalBar().addListener(SWT.Selection, e -> disableAutoScroll.run());
body.addListener(SWT.MouseVerticalWheel, e -> disableAutoScroll.run());
Comment thread
xinyi-gong marked this conversation as resolved.
}

/** Parsed (title?, body) tuple. */
Expand Down Expand Up @@ -272,9 +292,41 @@ private void refreshBody() {
}

body.requestLayout();
updateScrollerDuringStreaming();
refreshEnclosingScroller();
}

/** Resize the scroller to fit content (up to max height) and auto-scroll to bottom if enabled. */
private void updateScrollerDuringStreaming() {
if (bodyScroller == null || bodyScroller.isDisposed()) {
return;
}
int contentWidth = bodyScroller.getClientArea().width;
if (contentWidth <= 0) {
contentWidth = SWT.DEFAULT;
}
int contentHeight = body.computeSize(contentWidth, SWT.DEFAULT).y;
bodyScroller.setMinSize(contentWidth, contentHeight);

// Grow with content up to max; avoids blank space when content is small.
GridData scrollerData = (GridData) bodyScroller.getLayoutData();
int newHint = Math.min(contentHeight, STREAMING_MAX_HEIGHT);
if (scrollerData.heightHint != newHint) {
scrollerData.heightHint = newHint;
}

if (state == State.STREAMING && autoScroll) {
bodyScroller.setOrigin(0, contentHeight);
} else if (state == State.STREAMING && !autoScroll) {
// Re-enable auto-scroll if user scrolled back to the bottom.
int scrollPos = bodyScroller.getOrigin().y;
int viewportHeight = bodyScroller.getClientArea().height;
if (scrollPos + viewportHeight >= contentHeight - 10) {
autoScroll = true;
}
}
}

/**
* Split {@code raw} on standalone {@code **Title**} lines (terminator: newline or end of buffer). Text before any
* title becomes a leading section with {@code title == null}.
Expand Down Expand Up @@ -322,38 +374,34 @@ private static String stripTrailingNewlines(String s) {
}

private void setTitleText(String text) {
if (titleViewer == null || titleViewer.getTextWidget().isDisposed()) {
if (titleLabel == null || titleLabel.isDisposed()) {
return;
}
titleViewer.setMarkup(text == null ? "" : text);
titleLabel.setText(text == null ? "" : text);
updateTitleWidthHint();
titleViewer.getTextWidget().requestLayout();
titleLabel.requestLayout();
}

private void updateTitleWidthHint() {
if (titleViewer == null || header == null || header.isDisposed()) {
return;
}
StyledText titleText = titleViewer.getTextWidget();
if (titleText.isDisposed()) {
if (titleLabel == null || titleLabel.isDisposed() || header == null || header.isDisposed()) {
return;
}
int headerWidth = header.getClientArea().width;
if (headerWidth <= 0) {
return;
}
int iconWidth = iconLabel != null && !iconLabel.isDisposed() ? iconLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).x
: 0;
GridLayout layout = (GridLayout) header.getLayout();
int iconWidth = iconLabel != null && !iconLabel.isDisposed() && iconLabel.isVisible()
? iconLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).x : 0;
int chevronWidth = chevronLabel != null && !chevronLabel.isDisposed()
? chevronLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).x
: 0;
int spacing = headerLayout.horizontalSpacing * (headerLayout.numColumns - 1);
int available = headerWidth - iconWidth - chevronWidth - spacing - headerLayout.marginWidth * 2;
? chevronLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).x : 0;
int spacing = layout.horizontalSpacing * (layout.numColumns - 1);
int available = headerWidth - iconWidth - chevronWidth - spacing - layout.marginWidth * 2;
if (available <= 0) {
return;
}
GridData titleData = (GridData) titleText.getLayoutData();
int natural = titleText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
GridData titleData = (GridData) titleLabel.getLayoutData();
int natural = titleLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
int newHint = Math.min(natural, available);
if (newHint != titleData.widthHint) {
titleData.widthHint = newHint;
Expand All @@ -367,17 +415,34 @@ private void toggleExpanded() {

private void setExpanded(boolean newExpanded) {
this.expanded = newExpanded;
if (body != null && !body.isDisposed()) {
GridData data = (GridData) body.getLayoutData();

Composite bodyContainer = bodyScroller != null ? bodyScroller : body;
if (bodyContainer != null && !bodyContainer.isDisposed()) {
GridData data = (GridData) bodyContainer.getLayoutData();
data.exclude = !expanded;
body.setVisible(expanded);
bodyContainer.setVisible(expanded);
}
updateChevron();
requestLayout();
// Refresh the enclosing scroller so the revealed/hidden body height is reachable.
refreshEnclosingScroller();
}

/** Move body from ScrolledComposite to be a direct child of this block. */
private void unwrapBodyFromScroller() {
if (bodyScroller == null || bodyScroller.isDisposed() || body == null || body.isDisposed()) {
return;
}
bodyScroller.setContent(null);
body.setParent(this);
GridData bodyData = new GridData(SWT.FILL, SWT.FILL, true, false);
bodyData.exclude = !expanded;
body.setLayoutData(bodyData);
body.setVisible(expanded);
bodyScroller.dispose();
bodyScroller = null;
}

private void updateChevron() {
if (chevronLabel == null || chevronLabel.isDisposed()) {
return;
Expand All @@ -400,8 +465,8 @@ private void updateChevron() {
header.setToolTipText(tooltip);
chevronLabel.setImage(image);
chevronLabel.setToolTipText(tooltip);
if (titleViewer != null && !titleViewer.getTextWidget().isDisposed()) {
titleViewer.getTextWidget().setToolTipText(tooltip);
if (titleLabel != null && !titleLabel.isDisposed()) {
titleLabel.setToolTipText(tooltip);
}
}

Expand Down
17 changes: 13 additions & 4 deletions ...soft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ThinkingTurnWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ public void sealThinking() {
}
CopilotLanguageServerConnection ls = CopilotCore.getPlugin().getCopilotLanguageServer();
if (ls == null) {
target.showCancelled();
target.markSealed();
target.showCompleted(Messages.thinking_completedTitle);
Comment thread
xinyi-gong marked this conversation as resolved.
requestLayout();
return;
}
Expand All @@ -100,11 +101,19 @@ public void sealThinking() {
if (resp != null && StringUtils.isNotBlank(resp.title())) {
target.showCompleted(resp.title());
} else {
// Title fetch failed: surface the cancelled visual state so the spinner does not run forever.
target.showCancelled();
target.showCompleted(Messages.thinking_completedTitle);
}
requestLayout();
}, this));
}, this))
.exceptionally(ex -> {
SwtUtils.invokeOnDisplayThreadAsync(() -> {
if (!isDisposed() && !target.isDisposed() && !target.isFinalized()) {
target.showCompleted(Messages.thinking_completedTitle);
requestLayout();
}
}, this);
return null;
Comment thread
xinyi-gong marked this conversation as resolved.
});
}

@Override
Expand Down
Loading