maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/merogge/terminalEditor' into merogge/terminalEditor_tyriar

Browse source
This commit is contained in:
Daniel Imms 2021-06-15 06:26:45 -07:00
commit f5696915ba
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/contrib/terminal/browser/terminalActions.ts
View file

@ -207,10 +207,6 @@ export function registerTerminalActions() {
terminalService.createTerminal({
target: TerminalTarget.Editor
});
// const editorService = accessor.get(IEditorService);
// const instantiationService = accessor.get(IInstantiationService);
// const input = TerminalEditorInput.copy(terminalService, instantiationService);
// await editorService.openEditor(input, { pinned: true, forceReload: true });
}
});

3
src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
View file

@ -75,6 +75,7 @@ export class TerminalInputSerializer implements IEditorInputSerializer {
}
public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): TerminalEditorInput {
throw new Error('not implemented');
throw new Error('NYI');
// return TerminalEditorInput.copy(instantiationService);
}
}

13
src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
View file

@ -4,9 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import { URI } from 'vs/base/common/uri';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { ITerminalInstance, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
import { ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
export class TerminalEditorInput extends EditorInput {
@ -27,15 +26,15 @@ export class TerminalEditorInput extends EditorInput {
}
constructor(
instance: ITerminalInstance
terminalInstance: ITerminalInstance
) {
super();
this._terminalInstance = instance;
this._terminalInstance = terminalInstance;
}
static copy(terminalService: ITerminalService, instantiationService: IInstantiationService): TerminalEditorInput {
return new TerminalEditorInput(terminalService.createInstance({}));
}
// static copy(instantiationService: IInstantiationService): TerminalEditorInput {
// return instantiationService.createInstance(TerminalEditorInput);
// }
override getName() {
return this.terminalInstance.title;