Output in horizontal panel

src/vs/vscode.d.ts

@@ -2443,8 +2443,7 @@ declare namespace vscode {
 
 		/**
 		 * Reveal this channel in the UI.
-		 *
-		 * @param column The column in which to show the channel, default in [one](#ViewColumn.One).
+		 * @param column @deprecated **This argument is deprecated.** The column in which to show the channel, default in [one](#ViewColumn.One).
 		 * @param preserveFocus When `true` the channel will not take focus.
 		 */
 		show(column?: ViewColumn, preserveFocus?: boolean): void;

src/vs/workbench/api/node/extHostOutputService.ts

@@ -48,7 +48,7 @@ export class ExtHostOutputChannel implements vscode.OutputChannel {
 	}
 
 	show(column?: vscode.ViewColumn, preserveFocus?: boolean): void {
-		this._proxy.reveal(this._name, TypeConverters.fromViewColumn(column), preserveFocus);
+		this._proxy.reveal(this._name, preserveFocus);
 	}
 
 	hide(): void {
@@ -95,8 +95,8 @@ export class MainThreadOutputService {
 		return undefined;
 	}
 
-	public reveal(channel: string, position: Position, preserveFocus: boolean): TPromise<void> {
-		this._outputService.showOutput(channel, position, preserveFocus);
+	public reveal(channel: string, preserveFocus: boolean): TPromise<void> {
+		this._outputService.showOutput(channel, preserveFocus);
 		return undefined;
 	}
 

src/vs/workbench/browser/panel.ts

@@ -13,7 +13,11 @@ export abstract class Panel extends Composite implements IPanel { }
 /**
  * A panel descriptor is a leightweight descriptor of a panel in the monaco workbench.
  */
-export class PanelDescriptor extends CompositeDescriptor<Panel> { }
+export class PanelDescriptor extends CompositeDescriptor<Panel> {
+	constructor(moduleId: string, ctorName: string, id: string, name: string, cssClass?: string) {
+		super(moduleId, ctorName, id, name, cssClass);
+	}
+}
 
 export class PanelRegistry extends CompositeRegistry<Panel> {
 	private defaultPanelId: string;

src/vs/workbench/browser/parts/editor/baseEditor.ts

@@ -11,7 +11,7 @@ import types = require('vs/base/common/types');
 import {Builder} from 'vs/base/browser/builder';
 import {EventType, EditorEvent} from 'vs/workbench/common/events';
 import {Registry} from 'vs/platform/platform';
-import {Viewlet} from 'vs/workbench/browser/viewlet';
+import {Panel} from 'vs/workbench/browser/panel';
 import {EditorInput, IFileEditorInput, EditorOptions} from 'vs/workbench/common/editor';
 import {IEditor, Position, POSITIONS} from 'vs/platform/editor/common/editor';
 import {IInstantiationService, IConstructorSignature0} from 'vs/platform/instantiation/common/instantiation';
@@ -30,7 +30,7 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
  *
  * This class is only intended to be subclassed and not instantiated.
  */
-export abstract class BaseEditor extends Viewlet implements IEditor {
+export abstract class BaseEditor extends Panel implements IEditor {
 	private _input: EditorInput;
 	private _options: EditorOptions;
 	private _position: Position;

src/vs/workbench/browser/parts/editor/stringEditor.ts

@@ -13,7 +13,6 @@ import {DefaultConfig} from 'vs/editor/common/config/defaultConfig';
 import {EditorConfiguration} from 'vs/editor/common/config/commonEditorConfig';
 import {TextEditorOptions, EditorModel, EditorInput, EditorOptions} from 'vs/workbench/common/editor';
 import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
-import {LogEditorInput} from 'vs/workbench/common/editor/logEditorInput';
 import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInput';
 import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
 import {UntitledEditorEvent, EventType} from 'vs/workbench/common/events';
@@ -35,8 +34,6 @@ export class StringEditor extends BaseTextEditor {
 
 	public static ID = 'workbench.editors.stringEditor';
 
-	private defaultWrappingColumn: number;
-	private defaultLineNumbers: boolean;
 	private mapResourceToEditorViewState: { [resource: string]: IEditorViewState; };
 
 	constructor(
@@ -50,12 +47,8 @@ export class StringEditor extends BaseTextEditor {
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IModeService modeService: IModeService
 	) {
-
 		super(StringEditor.ID, telemetryService, instantiationService, contextService, storageService, messageService, configurationService, eventService, editorService, modeService);
 
-		this.defaultWrappingColumn = DefaultConfig.editor.wrappingColumn;
-		this.defaultLineNumbers = DefaultConfig.editor.lineNumbers;
-
 		this.mapResourceToEditorViewState = Object.create(null);
 
 		this.toUnbind.push(this.eventService.addListener(EventType.UNTITLED_FILE_DELETED, (e: UntitledEditorEvent) => this.onUntitledDeletedEvent(e)));
@@ -132,43 +125,17 @@ export class StringEditor extends BaseTextEditor {
 
 			// Apply options again because input has changed
 			textEditor.updateOptions(this.getCodeEditorOptions());
-
-			// Auto reveal last line for log editors
-			if (input instanceof LogEditorInput) {
-				this.revealLastLine();
-			}
 		});
 	}
 
-	protected applyConfiguration(configuration: any): void {
-
-		// Remember some settings that we overwrite from #getCodeEditorOptions()
-		let editorConfig = configuration && configuration[EditorConfiguration.EDITOR_SECTION];
-		if (editorConfig) {
-			this.defaultWrappingColumn = editorConfig.wrappingColumn;
-			this.defaultLineNumbers = editorConfig.lineNumbers;
-		}
-
-		super.applyConfiguration(configuration);
-	}
-
 	protected getCodeEditorOptions(): IEditorOptions {
 		let options = super.getCodeEditorOptions();
 
 		let input = this.getInput();
-		let isLog = input instanceof LogEditorInput;
 		let isUntitled = input instanceof UntitledEditorInput;
 
 		options.readOnly = !isUntitled; 				// all string editors are readonly except for the untitled one
 
-		if (isLog) {
-			options.wrappingColumn = 0;					// all log editors wrap
-			options.lineNumbers = false;				// all log editors hide line numbers
-		} else {
-			options.wrappingColumn = this.defaultWrappingColumn; 	// otherwise make sure to restore the defaults
-			options.lineNumbers = this.defaultLineNumbers; 			// otherwise make sure to restore the defaults
-		}
-
 		return options;
 	}
 
@@ -188,15 +155,6 @@ export class StringEditor extends BaseTextEditor {
 		return true;
 	}
 
-	public focus(): void {
-		super.focus();
-
-		// Auto reveal last line for log editors
-		if (this.getInput() instanceof LogEditorInput) {
-			this.revealLastLine();
-		}
-	}
-
 	public clearInput(): void {
 
 		// Keep editor view state in settings to restore when coming back

src/vs/workbench/buildfile.js

@@ -31,6 +31,7 @@ exports.collectModules= function(excludes) {
 
 		createModuleDescription('vs/workbench/parts/output/common/outputMode', languageMainExcludes),
 		createModuleDescription('vs/workbench/parts/output/common/outputWorker', languageWorkerExcludes),
+		createModuleDescription('vs/workbench/parts/output/browser/outputPanel', excludes),
 
 		createModuleDescription('vs/workbench/parts/debug/browser/debugViewlet', excludes),
 		createModuleDescription('vs/workbench/parts/debug/browser/repl', excludes),

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

@@ -12,10 +12,10 @@ import editor = require('vs/editor/common/editorCommon');
 import editorbrowser = require('vs/editor/browser/editorBrowser');
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 
-export var VIEWLET_ID = 'workbench.view.debug';
-export var REPL_ID = 'workbench.panel.repl';
-export var DEBUG_SERVICE_ID = 'debugService';
-export var CONTEXT_IN_DEBUG_MODE = 'inDebugMode';
+export const VIEWLET_ID = 'workbench.view.debug';
+export const REPL_ID = 'workbench.panel.repl';
+export const DEBUG_SERVICE_ID = 'debugService';
+export const CONTEXT_IN_DEBUG_MODE = 'inDebugMode';
 
 // raw
 

src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts

@@ -76,8 +76,7 @@ const openViewletKb: IKeybindings = {
 	'Repl',
 	debug.REPL_ID,
 	nls.localize('debugConsole', "Debug Console"),
-	'repl',
-	40
+	'repl'
 ));
 (<panel.PanelRegistry>platform.Registry.as(panel.Extensions.Panels)).setDefaultPanelId(debug.REPL_ID);
 

src/vs/workbench/parts/debug/electron-browser/debugService.ts

@@ -564,7 +564,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
 			}
 
 			// no task running, execute the preLaunchTask.
-			this.outputService.showOutput('Tasks', true, true);
+			this.outputService.showOutput('Tasks', true);
 
 			const taskPromise = this.taskService.run(filteredTasks[0].id).then(result => {
 				this.lastTaskEvent = null;

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

@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-workbench .output-action.clear-output {
+	background: url('clear_output.svg') center center no-repeat;
+}
+
+.monaco-workbench.vs-dark .output-action.clear-output {
+	background: url('clear_output_inverse.svg') center center no-repeat;
+}
+
+/* High Contrast Theming */
+
+.monaco-workbench.hc-black .output-action.clear-output {
+	background: none;
+}
+
+.monaco-workbench.hc-black .output-action.clear-output:before {
+	content: url('clear_output_inverse.svg');
+	position: absolute;
+	top: 12px;
+	left: 8px;
+	height: 16px;
+	width: 16px;
+}