#39638 Action to open channel in editor

src/vs/workbench/parts/output/browser/media/output.css

@@ -12,6 +12,15 @@
 	background: url('clear_output_inverse.svg') center center no-repeat;
 }
 
+.monaco-workbench .output-action.open-output {
+	background: url('open_output.svg') center center no-repeat;
+}
+
+.vs-dark .monaco-workbench .output-action.open-output,
+.hc-black .monaco-workbench .output-action.open-output {
+	background: url('open_output_inverse.svg') center center no-repeat;
+}
+
 .monaco-workbench .output-action.output-scroll-lock {
 	background: url('output_lock.svg') center center no-repeat;
 }

src/vs/workbench/parts/output/browser/outputActions.ts

@@ -52,6 +52,23 @@ export class ClearOutputAction extends Action {
 	}
 }
 
+export class OpenInEditorAction extends Action {
+
+	public static readonly ID = 'workbench.output.action.openInEditor';
+	public static readonly LABEL = nls.localize('openInEditor', "Open in Editor");
+
+	constructor(
+		id: string, label: string,
+		@IOutputService private outputService: IOutputService
+	) {
+		super(id, label, 'output-action open-output');
+	}
+
+	public run(): TPromise<any> {
+		return this.outputService.showChannelInEditor(this.outputService.getActiveChannel().id);
+	}
+}
+
 export class ToggleOutputScrollLockAction extends Action {
 
 	public static readonly ID = 'workbench.output.action.toggleOutputScrollLock';

src/vs/workbench/parts/output/browser/outputPanel.ts

@@ -19,7 +19,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
 import { OUTPUT_PANEL_ID, IOutputService, CONTEXT_IN_OUTPUT } from 'vs/workbench/parts/output/common/output';
-import { SwitchOutputAction, SwitchOutputActionItem, ClearOutputAction, ToggleOutputScrollLockAction } from 'vs/workbench/parts/output/browser/outputActions';
+import { SwitchOutputAction, SwitchOutputActionItem, ClearOutputAction, ToggleOutputScrollLockAction, OpenInEditorAction } from 'vs/workbench/parts/output/browser/outputActions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
@@ -55,6 +55,7 @@ export class OutputPanel extends TextResourceEditor {
 			this.actions = [
 				this.instantiationService.createInstance(SwitchOutputAction),
 				this.instantiationService.createInstance(ClearOutputAction, ClearOutputAction.ID, ClearOutputAction.LABEL),
+				this.instantiationService.createInstance(OpenInEditorAction, OpenInEditorAction.ID, OpenInEditorAction.LABEL),
 				this.instantiationService.createInstance(ToggleOutputScrollLockAction, ToggleOutputScrollLockAction.ID, ToggleOutputScrollLockAction.LABEL)
 			];
 

src/vs/workbench/parts/output/browser/outputServices.ts

@@ -29,6 +29,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { IFileService, FileChangeType } from 'vs/platform/files/common/files';
 import { IPanel } from 'vs/workbench/common/panel';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 
 const OUTPUT_ACTIVE_CHANNEL_KEY = 'output.activechannel';
 
@@ -249,7 +250,8 @@ export class OutputService implements IOutputService {
 		@IPanelService private panelService: IPanelService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IModelService modelService: IModelService,
-		@ITextModelService textModelResolverService: ITextModelService
+		@ITextModelService textModelResolverService: ITextModelService,
+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 	) {
 		const channels = this.getChannels();
 		this.activeChannelId = this.storageService.get(OUTPUT_ACTIVE_CHANNEL_KEY, StorageScope.WORKSPACE, channels && channels.length > 0 ? channels[0].id : null);
@@ -279,6 +281,10 @@ export class OutputService implements IOutputService {
 			.then(() => this._onActiveOutputChannel.fire(id));
 	}
 
+	showChannelInEditor(channelId: string): TPromise<void> {
+		return this.editorService.openEditor(this.createInput(channelId)) as TPromise;
+	}
+
 	getChannel(id: string): IOutputChannel {
 		if (!this.channels.has(id)) {
 			const channelData = Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).getChannel(id);
@@ -340,7 +346,7 @@ export class OutputService implements IOutputService {
 		return channel.show()
 			.then(() => {
 				this.storageService.store(OUTPUT_ACTIVE_CHANNEL_KEY, channelId, StorageScope.WORKSPACE);
-				this._outputPanel.setInput(this.createInput(this.getChannel(channelId)), EditorOptions.create({ preserveFocus: preserveFocus }));
+				this._outputPanel.setInput(this.createInput(channelId), EditorOptions.create({ preserveFocus: preserveFocus }));
 				if (!preserveFocus) {
 					this._outputPanel.focus();
 				}
@@ -354,9 +360,10 @@ export class OutputService implements IOutputService {
 		}
 	}
 
-	private createInput(channel: IOutputChannel): ResourceEditorInput {
-		const resource = URI.from({ scheme: OUTPUT_SCHEME, path: channel.id });
-		return this.instantiationService.createInstance(ResourceEditorInput, nls.localize('output', "Output"), channel ? nls.localize('channel', "for '{0}'", channel.label) : '', resource);
+	private createInput(channelId: string): ResourceEditorInput {
+		const channelData = Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).getChannel(channelId);
+		const resource = URI.from({ scheme: OUTPUT_SCHEME, path: channelData.id });
+		return this.instantiationService.createInstance(ResourceEditorInput, nls.localize('output', "{0} - Output", channelData.label), nls.localize('channel', "Output channel for '{0}'", channelData.label), resource);
 	}
 }
 

src/vs/workbench/parts/output/common/output.ts

@@ -79,6 +79,11 @@ export interface IOutputService {
 	 */
 	showChannel(id: string, preserveFocus?: boolean): TPromise<void>;
 
+	/**
+	 * Show the channel with the give id in editor
+	 */
+	showChannelInEditor(id: string): TPromise<void>;
+
 	/**
 	 * Allows to register on Output events.
 	 */