development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopt log service in terminal

Browse source 
Fixes #44442
This commit is contained in:
Daniel Imms 2018-02-26 13:48:01 -08:00
parent 74b681b08a
commit 174b9ad957
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
View file

@ -39,6 +39,7 @@ import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspac
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { ILogService } from 'vs/platform/log/common/log';
/** The amount of time to consider terminal errors to be related to the launch */
const LAUNCHING_DURATION = 500;
@ -129,7 +130,8 @@ export class TerminalInstance implements ITerminalInstance {
@IThemeService private readonly _themeService: IThemeService,
@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
@IConfigurationService private readonly _configurationService: IConfigurationService
@IConfigurationService private readonly _configurationService: IConfigurationService,
@ILogService private _logService: ILogService
) {
this._instanceDisposables = [];
this._processDisposables = [];
@ -144,6 +146,8 @@ export class TerminalInstance implements ITerminalInstance {
this._terminalHasTextContextKey = KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED.bindTo(this._contextKeyService);
this._preLaunchInputQueue = '';
this._logService.trace(`terminalInstance#ctor (id: ${this.id})`, this._shellLaunchConfig);
this._onDisposed = new Emitter<TerminalInstance>();
this._onFocused = new Emitter<TerminalInstance>();
this._onProcessIdReady = new Emitter<TerminalInstance>();
@ -151,7 +155,10 @@ export class TerminalInstance implements ITerminalInstance {
// Create a promise that resolves when the pty is ready
this._processReady = new TPromise<void>(c => {
this.onProcessIdReady(() => c(void 0));
this.onProcessIdReady(() => {
this._logService.debug(`Terminal process ready (id: ${this.id}, processId: ${this.processId})`);
c(void 0);
});
});
this._initDimensions();
@ -505,6 +512,8 @@ export class TerminalInstance implements ITerminalInstance {
}
public dispose(): void {
this._logService.trace(`terminalInstance#dispose (id: ${this.id})`);
if (this._windowsShellHelper) {
this._windowsShellHelper.dispose();
}