From 321c49324bce7f923a419c8301c96addeccb61c4 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 21 Jan 2016 16:37:30 +0100 Subject: [PATCH] output: OutputPanel override getId() instead of messing with StringEditor (causes api tests to fail) --- src/vs/workbench/browser/parts/editor/stringEditor.ts | 4 +--- src/vs/workbench/parts/output/browser/outputPanel.ts | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/stringEditor.ts b/src/vs/workbench/browser/parts/editor/stringEditor.ts index cdd1e0ae363..3fa2fd94c28 100644 --- a/src/vs/workbench/browser/parts/editor/stringEditor.ts +++ b/src/vs/workbench/browser/parts/editor/stringEditor.ts @@ -39,7 +39,6 @@ export class StringEditor extends BaseTextEditor { private mapResourceToEditorViewState: { [resource: string]: IEditorViewState; }; constructor( - id: string, @ITelemetryService telemetryService: ITelemetryService, @IInstantiationService instantiationService: IInstantiationService, @IWorkspaceContextService contextService: IWorkspaceContextService, @@ -50,8 +49,7 @@ export class StringEditor extends BaseTextEditor { @IWorkbenchEditorService editorService: IWorkbenchEditorService, @IModeService modeService: IModeService ) { - - super(id, telemetryService, instantiationService, contextService, storageService, messageService, configurationService, eventService, editorService, modeService); + super(StringEditor.ID, telemetryService, instantiationService, contextService, storageService, messageService, configurationService, eventService, editorService, modeService); this.defaultWrappingColumn = DefaultConfig.editor.wrappingColumn; this.defaultLineNumbers = DefaultConfig.editor.lineNumbers; diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts index 8a8a68be004..db715e67492 100644 --- a/src/vs/workbench/parts/output/browser/outputPanel.ts +++ b/src/vs/workbench/parts/output/browser/outputPanel.ts @@ -40,11 +40,15 @@ export class OutputPanel extends StringEditor { @IWorkbenchEditorService editorService: IWorkbenchEditorService, @IModeService modeService: IModeService ) { - super(OUTPUT_PANEL_ID, telemetryService, instantiationService, contextService, storageService, + super(telemetryService, instantiationService, contextService, storageService, messageService, configurationService, eventService, editorService, modeService); this.toDispose = []; } + public getId(): string { + return OUTPUT_PANEL_ID; + } + public getActions(): IAction[] { if (!this.actions) { this.actions = [ -- GitLab