Skip to content

Commit 8adc6e0

Browse files
committed
Fix tests and remove unused method
1 parent cc76abe commit 8adc6e0

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

src/vs/workbench/contrib/terminal/browser/terminal.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -854,11 +854,6 @@ export interface ITerminalInstance {
854854
*/
855855
toggleSizeToContentWidth(): Promise<void>;
856856

857-
/**
858-
* Sets whether escape seqeunce logging is enabled in the devtools console.
859-
*/
860-
setEscapeSequenceLogging(enable: boolean): void;
861-
862857
/**
863858
* Gets the initial current working directory, fetching it from the backend if required.
864859
*/

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,11 +1702,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
17021702
});
17031703
}
17041704

1705-
async setEscapeSequenceLogging(enable: boolean): Promise<void> {
1706-
const xterm = await this._xtermReadyPromise;
1707-
xterm.raw.options.logLevel = enable ? 'debug' : 'info';
1708-
}
1709-
17101705
@debounce(1000)
17111706
relaunch(): void {
17121707
this.reuseTerminal(this._shellLaunchConfig, true);

src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import { Emitter } from 'vs/base/common/event';
1919
import { TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR, TERMINAL_SELECTION_FOREGROUND_COLOR, TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
2020
import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
2121
import { WebglAddon } from 'xterm-addon-webgl';
22-
import { ILogService, NullLogService } from 'vs/platform/log/common/log';
22+
import { ILoggerService } from 'vs/platform/log/common/log';
2323
import { IStorageService } from 'vs/platform/storage/common/storage';
24-
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
24+
import { TestLoggerService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
2525
import { isSafari } from 'vs/base/browser/browser';
2626
import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
2727
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -112,7 +112,7 @@ suite('XtermTerminal', () => {
112112

113113
instantiationService = new TestInstantiationService();
114114
instantiationService.stub(IConfigurationService, configurationService);
115-
instantiationService.stub(ILogService, new NullLogService());
115+
instantiationService.stub(ILoggerService, new TestLoggerService());
116116
instantiationService.stub(IStorageService, new TestStorageService());
117117
instantiationService.stub(IThemeService, themeService);
118118
instantiationService.stub(IViewDescriptorService, viewDescriptorService);

src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuS
1212
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
1313
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
1414
import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
15-
import { ILogService, NullLogService } from 'vs/platform/log/common/log';
15+
import { ILogService, ILoggerService, NullLogService } from 'vs/platform/log/common/log';
1616
import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
1717
import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
1818
import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -24,6 +24,7 @@ import { ITerminalConfiguration } from 'vs/workbench/contrib/terminal/common/ter
2424
import { BufferContentTracker } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker';
2525
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
2626
import { TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
27+
import { TestLoggerService } from 'vs/workbench/test/common/workbenchTestServices';
2728
import { Terminal } from 'xterm';
2829

2930
const defaultTerminalConfig: Partial<ITerminalConfiguration> = {
@@ -55,6 +56,7 @@ suite('Buffer Content Tracker', () => {
5556
instantiationService.stub(IConfigurationService, configurationService);
5657
instantiationService.stub(IThemeService, themeService);
5758
instantiationService.stub(ILogService, new NullLogService());
59+
instantiationService.stub(ILoggerService, new TestLoggerService());
5860
instantiationService.stub(IContextMenuService, instantiationService.createInstance(ContextMenuService));
5961
instantiationService.stub(ILifecycleService, new TestLifecycleService());
6062
instantiationService.stub(IContextKeyService, new MockContextKeyService());

0 commit comments

Comments
 (0)