From 3fa400aaf9b3898026842ba4970ba29a45849c96 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 21 Dec 2017 08:48:37 +0100
Subject: [PATCH] Use a different id for log viewer editor

---
 src/vs/workbench/parts/output/browser/logViewer.ts          | 6 ++++++
 .../parts/output/electron-browser/output.contribution.ts    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/output/browser/logViewer.ts b/src/vs/workbench/parts/output/browser/logViewer.ts
index 44d2093968c..72fdcd488c2 100644
--- a/src/vs/workbench/parts/output/browser/logViewer.ts
+++ b/src/vs/workbench/parts/output/browser/logViewer.ts
@@ -22,6 +22,8 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { LOG_SCHEME } from 'vs/workbench/parts/output/common/output';
 
+export const LOG_VIEWER_EDITOR_ID = 'workbench.editors.logViewer';
+
 export class LogViewerInput extends ResourceEditorInput {
 
 	public static readonly ID = 'workbench.editorinputs.output';
@@ -57,6 +59,10 @@ export class LogViewer extends TextResourceEditor {
 		super(telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, textFileService);
 	}
 
+	public getId(): string {
+		return LOG_VIEWER_EDITOR_ID;
+	}
+
 	protected getConfigurationOverrides(): IEditorOptions {
 		const options = super.getConfigurationOverrides();
 		options.wordWrap = 'off'; // all log viewers do not wrap
diff --git a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts
index d2d784900f7..83e5e22c842 100644
--- a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts
+++ b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts
@@ -19,7 +19,7 @@ import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/c
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { OutputPanel } from 'vs/workbench/parts/output/browser/outputPanel';
 import { IEditorRegistry, Extensions as EditorExtensions, EditorDescriptor } from 'vs/workbench/browser/editor';
-import { LogViewer, LogViewerInput } from 'vs/workbench/parts/output/browser/logViewer';
+import { LogViewer, LogViewerInput, LOG_VIEWER_EDITOR_ID } from 'vs/workbench/parts/output/browser/logViewer';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -52,7 +52,7 @@ Registry.as<PanelRegistry>(Extensions.Panels).registerPanel(new PanelDescriptor(
 Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
 	new EditorDescriptor(
 		LogViewer,
-		LogViewer.ID,
+		LOG_VIEWER_EDITOR_ID,
 		nls.localize('logViewer', "Log Viewer")
 	),
 	[
-- 
GitLab