Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula

src/vs/base/browser/ui/splitview/panelview.ts

@@ -32,7 +32,7 @@ export interface IPanelStyles {
 
 export abstract class Panel implements IView {
 
-	private static HEADER_SIZE = 22;
+	private static readonly HEADER_SIZE = 22;
 
 	protected _expanded: boolean;
 	private expandedSize: number | undefined = undefined;
@@ -146,8 +146,8 @@ export abstract class Panel implements IView {
 		this.renderHeader(this.header);
 
 		const focusTracker = trackFocus(this.header);
-		focusTracker.addFocusListener(() => addClass(this.header, 'focused'));
-		focusTracker.addBlurListener(() => removeClass(this.header, 'focused'));
+		focusTracker.onDidFocus(() => addClass(this.header, 'focused'));
+		focusTracker.onDidBlur(() => removeClass(this.header, 'focused'));
 
 		this.updateHeader();
 
@@ -226,7 +226,7 @@ interface IDndContext {
 
 class PanelDraggable implements IDisposable {
 
-	private static DefaultDragOverBackgroundColor = new Color(new RGBA(128, 128, 128, 0.5));
+	private static readonly DefaultDragOverBackgroundColor = new Color(new RGBA(128, 128, 128, 0.5));
 
 	// see https://github.com/Microsoft/vscode/issues/14470
 	private dragOverCounter = 0;
@@ -338,7 +338,7 @@ export class PanelView implements IDisposable {
 
 	readonly onDidSashChange: Event<void>;
 
-	constructor(private container: HTMLElement, options: IPanelViewOptions = {}) {
+	constructor(container: HTMLElement, options: IPanelViewOptions = {}) {
 		this.dnd = !!options.dnd;
 		this.el = append(container, $('.monaco-panel-view'));
 		this.splitview = new SplitView(this.el);

src/vs/base/browser/ui/splitview/splitview.ts

@@ -7,7 +7,7 @@
 
 import 'vs/css!./splitview';
 import { IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import Event, { fromEventEmitter, mapEvent, Emitter } from 'vs/base/common/event';
+import Event, { mapEvent, Emitter } from 'vs/base/common/event';
 import types = require('vs/base/common/types');
 import dom = require('vs/base/browser/dom');
 import { clamp } from 'vs/base/common/numbers';
@@ -59,6 +59,25 @@ enum State {
 	Busy
 }
 
+function pushToEnd<T>(arr: T[], value: T): T[] {
+	let didFindValue = false;
+
+	const result = arr.filter(v => {
+		if (v === value) {
+			didFindValue = true;
+			return false;
+		}
+
+		return true;
+	});
+
+	if (didFindValue) {
+		result.push(value);
+	}
+
+	return result;
+}
+
 export class SplitView implements IDisposable {
 
 	private orientation: Orientation;
@@ -76,8 +95,7 @@ export class SplitView implements IDisposable {
 	get length(): number {
 		return this.viewItems.length;
 	}
-
-	constructor(private container: HTMLElement, options: ISplitViewOptions = {}) {
+	constructor(container: HTMLElement, options: ISplitViewOptions = {}) {
 		this.orientation = types.isUndefined(options.orientation) ? Orientation.VERTICAL : options.orientation;
 
 		this.el = document.createElement('div');
@@ -128,11 +146,11 @@ export class SplitView implements IDisposable {
 				? (e: IBaseSashEvent) => ({ sash, start: e.startY, current: e.currentY })
 				: (e: IBaseSashEvent) => ({ sash, start: e.startX, current: e.currentX });
 
-			const onStart = mapEvent(fromEventEmitter<IBaseSashEvent>(sash, 'start'), sashEventMapper);
+			const onStart = mapEvent(sash.onDidStart, sashEventMapper);
 			const onStartDisposable = onStart(this.onSashStart, this);
-			const onChange = mapEvent(fromEventEmitter<IBaseSashEvent>(sash, 'change'), sashEventMapper);
+			const onChange = mapEvent(sash.onDidChange, sashEventMapper);
 			const onSashChangeDisposable = onChange(this.onSashChange, this);
-			const onEnd = mapEvent<IBaseSashEvent, void>(fromEventEmitter<IBaseSashEvent>(sash, 'end'), () => null);
+			const onEnd = mapEvent<void, void>(sash.onDidEnd, () => null);
 			const onEndDisposable = onEnd(() => this._onDidSashChange.fire());
 
 			const disposable = combinedDisposable([onStartDisposable, onSashChangeDisposable, onEndDisposable, sash]);
@@ -204,9 +222,9 @@ export class SplitView implements IDisposable {
 		this.state = State.Idle;
 	}
 
-	private relayout(): void {
+	private relayout(lowPriorityIndex?: number): void {
 		const contentSize = this.viewItems.reduce((r, i) => r + i.size, 0);
-		this.resize(this.viewItems.length - 1, this.contentSize - contentSize);
+		this.resize(this.viewItems.length - 1, this.size - contentSize, undefined, lowPriorityIndex);
 	}
 
 	layout(size: number): void {
@@ -250,7 +268,7 @@ export class SplitView implements IDisposable {
 		size = typeof size === 'number' ? size : item.size;
 		size = clamp(size, item.view.minimumSize, item.view.maximumSize);
 		item.size = size;
-		this.relayout();
+		this.relayout(index);
 	}
 
 	resizeView(index: number, size: number): void {
@@ -299,21 +317,28 @@ export class SplitView implements IDisposable {
 		return this.viewItems[index].size;
 	}
 
-	private resize(index: number, delta: number, sizes = this.viewItems.map(i => i.size)): void {
+	private resize(index: number, delta: number, sizes = this.viewItems.map(i => i.size), lowPriorityIndex?: number): void {
 		if (index < 0 || index >= this.viewItems.length) {
 			return;
 		}
 
 		if (delta !== 0) {
-			const upIndexes = range(index, -1);
-			const up = upIndexes.map(i => this.viewItems[i]);
+			let upIndexes = range(index, -1);
+			let downIndexes = range(index + 1, this.viewItems.length);
+
+			if (typeof lowPriorityIndex === 'number') {
+				upIndexes = pushToEnd(upIndexes, lowPriorityIndex);
+				downIndexes = pushToEnd(downIndexes, lowPriorityIndex);
+			}
+
+			const upItems = upIndexes.map(i => this.viewItems[i]);
 			const upSizes = upIndexes.map(i => sizes[i]);
-			const downIndexes = range(index + 1, this.viewItems.length);
-			const down = downIndexes.map(i => this.viewItems[i]);
+
+			const downItems = downIndexes.map(i => this.viewItems[i]);
 			const downSizes = downIndexes.map(i => sizes[i]);
 
-			for (let i = 0, deltaUp = delta; deltaUp !== 0 && i < up.length; i++) {
-				const item = up[i];
+			for (let i = 0, deltaUp = delta; deltaUp !== 0 && i < upItems.length; i++) {
+				const item = upItems[i];
 				const size = clamp(upSizes[i] + deltaUp, item.view.minimumSize, item.view.maximumSize);
 				const viewDelta = size - upSizes[i];
 
@@ -321,8 +346,8 @@ export class SplitView implements IDisposable {
 				item.size = size;
 			}
 
-			for (let i = 0, deltaDown = delta; deltaDown !== 0 && i < down.length; i++) {
-				const item = down[i];
+			for (let i = 0, deltaDown = delta; deltaDown !== 0 && i < downItems.length; i++) {
+				const item = downItems[i];
 				const size = clamp(downSizes[i] - deltaDown, item.view.minimumSize, item.view.maximumSize);
 				const viewDelta = size - downSizes[i];