Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -650,16 +650,30 @@ public void setupTerminal(Composite parent) {
fClipboard.dispose();
fPollingTextCanvasModel.stopPolling();
}
// set on this terminal alone (Inverted colors in its menu): kept across a move
boolean inverted = fCtlText != null && fCtlText.isInvertedColors();
if (fWndParent != null && !fWndParent.isDisposed()) {
// terminal widget gets a new parent (DnD)
fWndParent.dispose();
}
// the old canvas, if any, went with its parent: the new one measures on the display
// until it exists
fCtlText = null;
setupControls(parent);
setCommandInputField(fCommandInputField);
setupListeners();
if (fPreferenceStore != null && wasDisposed) {
updatePreferences(null);
fPreferenceStore.addPropertyChangeListener(fPreferenceListener);
if (wasDisposed) {
if (fPreferenceStore != null) {
updatePreferences(null);
fPreferenceStore.addPropertyChangeListener(fPreferenceListener);
}
} else {
// moved: the new canvas needs the colors and the font (the defaults without a
// preference store), but what was set on this terminal stays, the buffer line
// limit included
onTerminalColorsChanged();
onTerminalFontChanged();
setInvertedColors(inverted);
}
JFaceResources.getFontRegistry().addListener(fFontListener);
setupHelp(fWndParent, TerminalPlugin.HELP_VIEW);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/*******************************************************************************
* Copyright (c) 2026 Eclipse contributors and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.terminal.internal.textcanvas;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.eclipse.jface.preference.PreferenceStore;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.terminal.connector.ITerminalConnector;
import org.eclipse.terminal.connector.TerminalState;
import org.eclipse.terminal.control.ITerminalListener;
import org.eclipse.terminal.control.TerminalTitleRequestor;
import org.eclipse.terminal.internal.emulator.VT100TerminalControl;
import org.eclipse.terminal.internal.preferences.ITerminalConstants;
import org.eclipse.terminal.model.TerminalColor;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

/**
* Tests recreating the terminal controls in a new parent, as moving a terminal tab to another
* terminals view does.
*/
public class TerminalControlRecreateUITest {

private static final RGB BACKGROUND = new RGB(1, 2, 3);

private Display display;
private Shell shell;
private VT100TerminalControl terminal;
private ITerminalListener listener;

@BeforeEach
public void createTerminal() {
display = Display.getCurrent() != null ? null : new Display();
shell = new Shell();
shell.setLayout(new FillLayout());
PreferenceStore preferences = new PreferenceStore();
preferences.setValue(ITerminalConstants.getPrefForTerminalColor(TerminalColor.BACKGROUND),
"1,2,3"); //$NON-NLS-1$
preferences.setValue(ITerminalConstants.PREF_BUFFERLINES, 1000);
listener = new ITerminalListener() {
@Override
public void setState(TerminalState state) {
}

@Override
public void setTerminalSelectionChanged() {
}

@Override
public void setTerminalTitle(String title, TerminalTitleRequestor requestor) {
}
};
terminal = new VT100TerminalControl(listener, new Composite(shell, 0), new ITerminalConnector[0], preferences);
}

@AfterEach
public void dispose() {
// as the terminals view does when a terminal tab is closed
terminal.disposeTerminal();
shell.dispose();
if (display != null) {
display.dispose();
}
}

private void recreateInNewParent() {
terminal.setupTerminal(new Composite(shell, 0));
}

@Test
public void recreatingDoesNotUseTheDisposedCanvas() {
assertDoesNotThrow(this::recreateInNewParent);
}

@Test
public void recreatedCanvasKeepsThePreferences() {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test only checks the background color. Could it also check the font (the part that threw Widget is disposed), and, with the fix above, that setInvertedColors(true) survives setupTerminal()?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test now also checks the font (the part that threw "Widget is disposed"), and a new test sets the inverted colors and a buffer line limit of 123 on the terminal, recreates it and checks both stay. On master all three tests fail with "Widget is disposed"; on the previous head of this PR the new one failed on the inverted colors.

assertEquals(BACKGROUND, ((TextCanvas) terminal.getControl()).getCellRenderer().getDefaultBackgroundColor().getRGB());
recreateInNewParent();
assertEquals(BACKGROUND, ((TextCanvas) terminal.getControl()).getCellRenderer().getDefaultBackgroundColor().getRGB());
// the font too: setting it measured on the disposed canvas and threw "Widget is disposed"
assertSame(JFaceResources.getTextFont(), terminal.getControl().getFont());
}

@Test
public void recreatedCanvasKeepsWhatWasSetOnThisTerminal() {
// set on this terminal, not in the preferences: a move must not reset them to the preferences
terminal.setInvertedColors(true);
terminal.setBufferLineLimit(123);
recreateInNewParent();
assertTrue(terminal.isInvertedColors());
assertEquals(123, terminal.getBufferLineLimit());
}

@Test
public void recreatedWithoutPreferencesKeepsTheInvertedColors() {
// a control made without a preference store, as TerminalViewControlFactory's default makes it
terminal.disposeTerminal();
terminal = new VT100TerminalControl(listener, new Composite(shell, 0), new ITerminalConnector[0]);
terminal.setInvertedColors(true);
recreateInNewParent();
assertTrue(terminal.isInvertedColors());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
org.eclipse.terminal.internal.textcanvas.TextCanvasModelTest.class, //
org.eclipse.terminal.internal.connector.TerminalConnectorTest.class, //
org.eclipse.terminal.internal.connector.TerminalToRemoteInjectionOutputStreamTest.class, //
org.eclipse.terminal.internal.textcanvas.TerminalControlRecreateUITest.class, //
Comment thread
insjang marked this conversation as resolved.
Resolved
org.eclipse.terminal.view.ui.tests.TerminalsViewReorderTest.class, //
})
public class AutomatedTestSuite {
Expand Down
Loading