提交 a0c6566f 编写于 作者: D Daniel Imms

Fix strictFunctionTypes errors in terminalService

Part of #81574
上级 4ddddcfb
...@@ -258,7 +258,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { ...@@ -258,7 +258,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
public constructor( public constructor(
private readonly _terminalFocusContextKey: IContextKey<boolean>, private readonly _terminalFocusContextKey: IContextKey<boolean>,
private readonly _configHelper: TerminalConfigHelper, private readonly _configHelper: TerminalConfigHelper,
private _container: HTMLElement, private _container: HTMLElement | undefined,
private _shellLaunchConfig: IShellLaunchConfig, private _shellLaunchConfig: IShellLaunchConfig,
@ITerminalInstanceService private readonly _terminalInstanceService: ITerminalInstanceService, @ITerminalInstanceService private readonly _terminalInstanceService: ITerminalInstanceService,
@IContextKeyService private readonly _contextKeyService: IContextKeyService, @IContextKeyService private readonly _contextKeyService: IContextKeyService,
...@@ -548,7 +548,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { ...@@ -548,7 +548,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
} }
// The container changed, reattach // The container changed, reattach
this._container.removeChild(this._wrapperElement); if (this._container) {
this._container.removeChild(this._wrapperElement);
}
this._container = container; this._container = container;
this._container.appendChild(this._wrapperElement); this._container.appendChild(this._wrapperElement);
} }
...@@ -801,7 +803,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { ...@@ -801,7 +803,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
if (this._wrapperElement.xterm) { if (this._wrapperElement.xterm) {
this._wrapperElement.xterm = undefined; this._wrapperElement.xterm = undefined;
} }
if (this._wrapperElement.parentElement) { if (this._wrapperElement.parentElement && this._container) {
this._container.removeChild(this._wrapperElement); this._container.removeChild(this._wrapperElement);
} }
} }
......
...@@ -17,7 +17,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti ...@@ -17,7 +17,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { IFileService } from 'vs/platform/files/common/files'; import { IFileService } from 'vs/platform/files/common/files';
import { TerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminalInstance'; import { TerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminalInstance';
import { IBrowserTerminalConfigHelper, ITerminalService, ITerminalInstance, ITerminalTab } from 'vs/workbench/contrib/terminal/browser/terminal'; import { ITerminalService, ITerminalInstance, ITerminalTab } from 'vs/workbench/contrib/terminal/browser/terminal';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper'; import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper';
import { IQuickInputService, IQuickPickItem, IPickOptions } from 'vs/platform/quickinput/common/quickInput'; import { IQuickInputService, IQuickPickItem, IPickOptions } from 'vs/platform/quickinput/common/quickInput';
...@@ -54,7 +54,7 @@ export class TerminalService implements ITerminalService { ...@@ -54,7 +54,7 @@ export class TerminalService implements ITerminalService {
public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; } public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; }
public get terminalTabs(): ITerminalTab[] { return this._terminalTabs; } public get terminalTabs(): ITerminalTab[] { return this._terminalTabs; }
private _configHelper: IBrowserTerminalConfigHelper; private _configHelper: TerminalConfigHelper;
private _terminalContainer: HTMLElement | undefined; private _terminalContainer: HTMLElement | undefined;
public get configHelper(): ITerminalConfigHelper { return this._configHelper; } public get configHelper(): ITerminalConfigHelper { return this._configHelper; }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册