Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-02 00:09:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert terminal editor regressions #298688 , #302139 (#305782)

Browse Source
This commit is contained in:
Anthony Kim
2026-03-27 12:56:28 -07:00
committed by GitHub
parent 2056bef1cf
commit 1d01418cd5
6 changed files with 7 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vs/platform/terminal/common/terminal.ts
View File

@@ -123,7 +123,6 @@ export const enum TerminalSettingId {
EnableKittyKeyboardProtocol = 'terminal.integrated.enableKittyKeyboardProtocol',
EnableWin32InputMode = 'terminal.integrated.enableWin32InputMode',
AllowInUntrustedWorkspace = 'terminal.integrated.allowInUntrustedWorkspace',
EditorUseEditorBackground = 'terminal.integrated.editorUseEditorBackground',
// Developer/debug settings

4
src/vs/workbench/contrib/terminal/browser/media/terminal.css
View File

@@ -62,8 +62,8 @@
background-image: none !important;
}
.monaco-workbench .terminal-editor .terminal-wrapper.use-editor-background {
background-color: var(--vscode-editor-background);
.monaco-workbench .terminal-editor .terminal-wrapper {
background-color: var(--vscode-terminal-background, var(--vscode-editorPane-background));
}
.monaco-workbench .terminal-editor .terminal-wrapper,
.monaco-workbench .pane-body.integrated-terminal .terminal-wrapper {

14
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View File

@@ -227,7 +227,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
set target(value: TerminalLocation | undefined) {
this._targetRef.object = value;
this._onDidChangeTarget.fire(value);
this._updateEditorBackgroundClass();
}
get instanceId(): number { return this._instanceId; }
@@ -400,7 +399,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this._wrapperElement = document.createElement('div');
this._wrapperElement.classList.add('terminal-wrapper');
this._updateEditorBackgroundClass();
this._widgetManager = this._register(instantiationService.createInstance(TerminalWidgetManager));
@@ -583,9 +581,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this.updateConfig();
this.setVisible(this._isVisible);
}
if (e.affectsConfiguration(TerminalSettingId.EditorUseEditorBackground)) {
this._updateEditorBackgroundClass();
}
const layoutSettings: string[] = [
TerminalSettingId.FontSize,
TerminalSettingId.FontFamily,
@@ -1923,11 +1918,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this._refreshEnvironmentVariableInfoWidgetState(this._processManager.environmentVariableInfo);
}
private _updateEditorBackgroundClass(): void {
const useEditorBg = this.target === TerminalLocation.Editor && this._configurationService.getValue(TerminalSettingId.EditorUseEditorBackground);
this._wrapperElement.classList.toggle('use-editor-background', !!useEditorBg);
}
private async _updateUnicodeVersion(): Promise<void> {
this._processManager.setUnicodeVersion(this._terminalConfigurationService.config.unicodeVersion);
}
@@ -2823,14 +2813,10 @@ export class TerminalInstanceColorProvider implements IXtermColorProvider {
constructor(
private readonly _target: IReference<TerminalLocation | undefined>,
@IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService,
@IConfigurationService private readonly _configurationService: IConfigurationService,
) {
}
getBackgroundColor(theme: IColorTheme) {
if (this._target.object === TerminalLocation.Editor && this._configurationService.getValue(TerminalSettingId.EditorUseEditorBackground)) {
return theme.getColor(editorBackground);
}
const terminalBackground = theme.getColor(TERMINAL_BACKGROUND_COLOR);
if (terminalBackground) {
return terminalBackground;

2
src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
View File

@@ -281,7 +281,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
if (e.affectsConfiguration(TerminalSettingId.UnicodeVersion)) {
this._updateUnicodeVersion();
}
if (e.affectsConfiguration(TerminalSettingId.ShellIntegrationDecorationsEnabled) || e.affectsConfiguration(TerminalSettingId.EditorUseEditorBackground)) {
if (e.affectsConfiguration(TerminalSettingId.ShellIntegrationDecorationsEnabled)) {
this._updateTheme();
}
}));

5
src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
View File

@@ -124,11 +124,6 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
default: 'view',
description: localize('terminal.integrated.defaultLocation', "Controls where newly created terminals will appear.")
},
[TerminalSettingId.EditorUseEditorBackground]: {
type: 'boolean',
default: true,
markdownDescription: localize('terminal.integrated.editorUseEditorBackground', "Controls whether terminals in the editor area use the editor background color instead of the terminal background color. When enabled, this takes precedence over {0} for terminals in the editor area.", '`#terminal.integrated.background#`')
},
[TerminalSettingId.TabsFocusMode]: {
type: 'string',
enum: ['singleClick', 'doubleClick'],

114
src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
View File

@@ -4,9 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import { deepStrictEqual, strictEqual } from 'assert';
import { Color } from '../../../../../base/common/color.js';
import { Event } from '../../../../../base/common/event.js';
import { Disposable, ImmortalReference } from '../../../../../base/common/lifecycle.js';
import { Disposable } from '../../../../../base/common/lifecycle.js';
import { Schemas } from '../../../../../base/common/network.js';
import { isWindows, type IProcessEnvironment } from '../../../../../base/common/platform.js';
import { URI } from '../../../../../base/common/uri.js';
@@ -17,19 +16,15 @@ import { TestInstantiationService } from '../../../../../platform/instantiation/
import { ResultKind } from '../../../../../platform/keybinding/common/keybindingResolver.js';
import { TerminalCapability, type ICwdDetectionCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
import { TerminalCapabilityStore } from '../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
import { GeneralShellType, ITerminalChildProcess, ITerminalProfile, TerminalLocation, TitleEventSource, type IShellLaunchConfig, type ITerminalBackend, type ITerminalProcessOptions } from '../../../../../platform/terminal/common/terminal.js';
import { GeneralShellType, ITerminalChildProcess, ITerminalProfile, TitleEventSource, type IShellLaunchConfig, type ITerminalBackend, type ITerminalProcessOptions } from '../../../../../platform/terminal/common/terminal.js';
import { IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
import { editorBackground } from '../../../../../platform/theme/common/colorRegistry.js';
import { TestColorTheme } from '../../../../../platform/theme/test/common/testThemeService.js';
import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../../common/theme.js';
import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
import { IViewDescriptorService } from '../../../../common/views.js';
import { ITerminalConfigurationService, ITerminalInstance, ITerminalInstanceService, ITerminalService } from '../../browser/terminal.js';
import { TerminalConfigurationService } from '../../browser/terminalConfigurationService.js';
import { parseExitResult, TerminalInstance, TerminalInstanceColorProvider, TerminalLabelComputer } from '../../browser/terminalInstance.js';
import { parseExitResult, TerminalInstance, TerminalLabelComputer } from '../../browser/terminalInstance.js';
import { IEnvironmentVariableService } from '../../common/environmentVariable.js';
import { EnvironmentVariableService } from '../../common/environmentVariableService.js';
import { ITerminalProfileResolverService, ProcessState, DEFAULT_COMMANDS_TO_SKIP_SHELL } from '../../common/terminal.js';
import { TERMINAL_BACKGROUND_COLOR } from '../../common/terminalColorRegistry.js';
import { TestViewDescriptorService } from './xterm/xtermTerminal.test.js';
import { fixPath } from '../../../../services/search/test/browser/queryBuilder.test.js';
import { TestTerminalProfileResolverService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
@@ -636,104 +631,3 @@ suite('Workbench - TerminalInstance', () => {
});
});
});
suite('TerminalInstanceColorProvider', () => {
const store = ensureNoDisposablesAreLeakedInTestSuite();
let configurationService: TestConfigurationService;
let viewDescriptorService: TestViewDescriptorService;
function createColorProvider(location: TerminalLocation | undefined): TerminalInstanceColorProvider {
const instantiationService = workbenchInstantiationService({
configurationService: () => configurationService,
}, store);
viewDescriptorService = new TestViewDescriptorService();
instantiationService.stub(IViewDescriptorService, viewDescriptorService as Partial<IViewDescriptorService>);
return instantiationService.createInstance(TerminalInstanceColorProvider, new ImmortalReference(location));
}
setup(() => {
configurationService = new TestConfigurationService({
terminal: {
integrated: {
editorUseEditorBackground: true
}
}
});
});
test('editor terminal with editorUseEditorBackground=true returns editor background', () => {
const provider = createColorProvider(TerminalLocation.Editor);
const theme = new TestColorTheme({
[editorBackground]: '#1e1e1e',
[TERMINAL_BACKGROUND_COLOR]: '#ff0000',
});
const result = provider.getBackgroundColor(theme);
deepStrictEqual(result, Color.fromHex('#1e1e1e'));
});
test('editor terminal with editorUseEditorBackground=false and TERMINAL_BACKGROUND_COLOR defined returns terminal background', () => {
configurationService = new TestConfigurationService({
terminal: {
integrated: {
editorUseEditorBackground: false
}
}
});
const provider = createColorProvider(TerminalLocation.Editor);
const theme = new TestColorTheme({
[editorBackground]: '#1e1e1e',
[TERMINAL_BACKGROUND_COLOR]: '#ff0000',
});
const result = provider.getBackgroundColor(theme);
deepStrictEqual(result, Color.fromHex('#ff0000'));
});
test('editor terminal with editorUseEditorBackground=false and no TERMINAL_BACKGROUND_COLOR falls back to editor background', () => {
configurationService = new TestConfigurationService({
terminal: {
integrated: {
editorUseEditorBackground: false
}
}
});
const provider = createColorProvider(TerminalLocation.Editor);
const theme = new TestColorTheme({
[editorBackground]: '#1e1e1e',
});
const result = provider.getBackgroundColor(theme);
deepStrictEqual(result, Color.fromHex('#1e1e1e'));
});
test('panel terminal ignores editorUseEditorBackground and uses TERMINAL_BACKGROUND_COLOR', () => {
const provider = createColorProvider(TerminalLocation.Panel);
const theme = new TestColorTheme({
[editorBackground]: '#1e1e1e',
[TERMINAL_BACKGROUND_COLOR]: '#ff0000',
});
const result = provider.getBackgroundColor(theme);
deepStrictEqual(result, Color.fromHex('#ff0000'));
});
test('panel terminal without TERMINAL_BACKGROUND_COLOR falls back to panel background', () => {
const provider = createColorProvider(TerminalLocation.Panel);
viewDescriptorService.moveTerminalToLocation(ViewContainerLocation.Panel);
const theme = new TestColorTheme({
[PANEL_BACKGROUND]: '#00ff00',
[SIDE_BAR_BACKGROUND]: '#0000ff',
});
const result = provider.getBackgroundColor(theme);
deepStrictEqual(result, Color.fromHex('#00ff00'));
});
test('sidebar terminal without TERMINAL_BACKGROUND_COLOR falls back to sidebar background', () => {
const provider = createColorProvider(TerminalLocation.Panel);
viewDescriptorService.moveTerminalToLocation(ViewContainerLocation.Sidebar);
const theme = new TestColorTheme({
[PANEL_BACKGROUND]: '#00ff00',
[SIDE_BAR_BACKGROUND]: '#0000ff',
});
const result = provider.getBackgroundColor(theme);
deepStrictEqual(result, Color.fromHex('#0000ff'));
});
});