提交 387012da 编写于 作者: D Daniel Imms

Remove container from instance ctor

This wasn't being used anymore
上级 39c4261b
......@@ -117,7 +117,7 @@ export interface ITerminalService {
/**
* Creates a raw terminal instance, this should not be used outside of the terminal part.
*/
createInstance(container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
createInstance(shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
getInstanceFromId(terminalId: number): ITerminalInstance | undefined;
getInstanceFromIndex(terminalIndex: number): ITerminalInstance;
getTabLabels(): string[];
......
......@@ -270,7 +270,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
if ('instanceId' in shellLaunchConfigOrInstance) {
instance = shellLaunchConfigOrInstance;
} else {
instance = this._terminalService.createInstance(undefined, shellLaunchConfigOrInstance);
instance = this._terminalService.createInstance(shellLaunchConfigOrInstance);
}
this._terminalInstances.push(instance);
this._initInstanceListeners(instance);
......@@ -438,7 +438,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
}
split(shellLaunchConfig: IShellLaunchConfig): ITerminalInstance {
const instance = this._terminalService.createInstance(undefined, shellLaunchConfig);
const instance = this._terminalService.createInstance(shellLaunchConfig);
this._terminalInstances.splice(this._activeInstanceIndex + 1, 0, instance);
this._initInstanceListeners(instance);
this._setActiveInstance(instance);
......
......@@ -103,6 +103,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private _skipTerminalCommands: string[];
private _shellType: TerminalShellType;
private _title: string = '';
private _container: HTMLElement | undefined;
private _wrapperElement: (HTMLElement & { xterm?: XTermTerminal }) | undefined;
private _xterm: XTermTerminal | undefined;
private _xtermCore: XTermCore | undefined;
......@@ -131,7 +132,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private _commandTrackerAddon: CommandTrackerAddon | undefined;
private _navigationModeAddon: INavigationMode & ITerminalAddon | undefined;
private _timeoutDimension: dom.Dimension | undefined;
private _lastLayoutDimensions: dom.Dimension | undefined;
private _hasHadInput: boolean;
......@@ -222,8 +222,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private readonly _terminalShellTypeContextKey: IContextKey<string>,
private readonly _terminalAltBufferActiveContextKey: IContextKey<boolean>,
private readonly _configHelper: TerminalConfigHelper,
// TODO: Remove this, it's never set in the ctor
private _container: HTMLElement | undefined,
private _shellLaunchConfig: IShellLaunchConfig,
@ITerminalInstanceService private readonly _terminalInstanceService: ITerminalInstanceService,
@ITerminalProfileResolverService private readonly _terminalProfileResolverService: ITerminalProfileResolverService,
......@@ -280,11 +278,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this._xtermReadyPromise.then(async () => {
// Wait for a period to allow a container to be ready
await this._containerReadyBarrier.wait();
// Only attach xterm.js to the DOM if the terminal panel has been opened before.
if (_container) {
this._attachToElement(_container);
}
this._createProcess();
});
......@@ -1491,8 +1484,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
return;
}
this._timeoutDimension = new dom.Dimension(dimension.width, dimension.height);
if (this._xterm && this._xterm.element) {
this._xterm.element.style.width = terminalWidth + 'px';
}
......
......@@ -987,13 +987,12 @@ export class TerminalService implements ITerminalService {
return { label, description: profile.path, profile, buttons };
}
createInstance(container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance {
createInstance(shellLaunchConfig: IShellLaunchConfig): ITerminalInstance {
const instance = this._instantiationService.createInstance(TerminalInstance,
this._terminalFocusContextKey,
this._terminalShellTypeContextKey,
this._terminalAltBufferActiveContextKey,
this._configHelper,
container,
shellLaunchConfig
);
this._onInstanceCreated.fire(instance);
......@@ -1039,7 +1038,7 @@ export class TerminalService implements ITerminalService {
throw new Error('Could not create terminal when process support is not registered');
}
if (shellLaunchConfig.hideFromUser) {
const instance = this.createInstance(undefined, shellLaunchConfig);
const instance = this.createInstance(shellLaunchConfig);
this._backgroundedTerminalInstances.push(instance);
this._initInstanceListeners(instance);
return instance;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册