Merge branch 'master' into electron-6.0.x

Author: deepak1556

package.json

@@ -52,7 +52,7 @@
     "vscode-ripgrep": "^1.3.1",
     "vscode-sqlite3": "4.0.8",
     "vscode-textmate": "microsoft/vscode-textmate#update_oniguruma",
-    "xterm": "3.15.0-beta70",
+    "xterm": "3.15.0-beta71",
     "xterm-addon-search": "0.2.0-beta2",
     "xterm-addon-web-links": "0.1.0-beta10",
     "yauzl": "^2.9.2",

remote/package.json

@@ -21,7 +21,7 @@
     "vscode-proxy-agent": "0.4.0",
     "vscode-ripgrep": "^1.3.1",
     "vscode-textmate": "microsoft/vscode-textmate#update_oniguruma",
-    "xterm": "3.15.0-beta70",
+    "xterm": "3.15.0-beta71",
     "xterm-addon-search": "0.2.0-beta2",
     "xterm-addon-web-links": "0.1.0-beta10",
     "yauzl": "^2.9.2",

remote/yarn.lock

@@ -1553,10 +1553,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.1.0-beta10.tgz#610fa9773a2a5ccd41c1c83ba0e2dd2c9eb66a23"
   integrity sha512-xfpjy0V6bB4BR44qIgZQPoCMVakxb65gMscPkHpO//QxvUxKzabV3dxOsIbeZRFkUGsWTFlvz2OoaBLoNtv5gg==
 
-[email protected]beta70:
-  version "3.15.0-beta70"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta70.tgz#3e81f32e8cd7147f9a0764fbe2599c277c697a74"
-  integrity sha512-VXhEbWwaxrs9Ac2KuTCmGX7Ktd0V+rVF5sdjXBsq/KBCtnUdwNzKnEjamNPsoNTDUv9y93INEbq82X7iBs1Gwg==
+[email protected]beta71:
+  version "3.15.0-beta71"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta71.tgz#2728c9800ca3b08423e835e9504bd1f4b5de6253"
+  integrity sha512-8M/cLaxZ+iDopRxLPdPfKuDGaNNyYTdCeytdxjMSH0N7dZzbx6fbaEygQdCrV5pO9cGnT92MefSjVPGRXRiBLA==
 
 yauzl@^2.9.2:
   version "2.10.0"

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

@@ -7,7 +7,7 @@ import 'vs/css!./gridview';
 import { Orientation } from 'vs/base/browser/ui/sash/sash';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { tail2 as tail, equals } from 'vs/base/common/arrays';
-import { orthogonal, IView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles } from './gridview';
+import { orthogonal, IView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles, IViewSize } from './gridview';
 import { Event, Emitter } from 'vs/base/common/event';
 import { $ } from 'vs/base/browser/dom';
 import { LayoutPriority } from 'vs/base/browser/ui/splitview/splitview';
@@ -117,10 +117,6 @@ function getDirectionOrientation(direction: Direction): Orientation {
 	return direction === Direction.Up || direction === Direction.Down ? Orientation.VERTICAL : Orientation.HORIZONTAL;
 }
 
-function getSize(dimensions: { width: number; height: number; }, orientation: Orientation) {
-	return orientation === Orientation.HORIZONTAL ? dimensions.width : dimensions.height;
-}
-
 export function getRelativeLocation(rootOrientation: Orientation, location: number[], direction: Direction): number[] {
 	const orientation = getLocationOrientation(rootOrientation, location);
 	const directionOrientation = getDirectionOrientation(direction);
@@ -209,8 +205,6 @@ export class Grid<T extends IView> extends Disposable {
 
 	get element(): HTMLElement { return this.gridview.element; }
 
-	sashResetSizing: Sizing = Sizing.Distribute;
-
 	constructor(view: T, options: IGridOptions = {}) {
 		super();
 		this.gridview = new GridView(options);
@@ -298,15 +292,14 @@ export class Grid<T extends IView> extends Disposable {
 		return this.gridview.swapViews(fromLocation, toLocation);
 	}
 
-	resizeView(view: T, size: number): void {
+	resizeView(view: T, size: IViewSize): void {
 		const location = this.getViewLocation(view);
 		return this.gridview.resizeView(location, size);
 	}
 
-	getViewSize(view: T): number {
+	getViewSize(view: T): IViewSize {
 		const location = this.getViewLocation(view);
-		const viewSize = this.gridview.getViewSize(location);
-		return getLocationOrientation(this.orientation, location) === Orientation.HORIZONTAL ? viewSize.width : viewSize.height;
+		return this.gridview.getViewSize(location);
 	}
 
 	// TODO@joao cleanup
@@ -361,18 +354,8 @@ export class Grid<T extends IView> extends Disposable {
 	}
 
 	private doResetViewSize(location: number[]): void {
-		if (this.sashResetSizing === Sizing.Split) {
-			const orientation = getLocationOrientation(this.orientation, location);
-			const firstViewSize = getSize(this.gridview.getViewSize(location), orientation);
-			const [parentLocation, index] = tail(location);
-			const secondViewSize = getSize(this.gridview.getViewSize([...parentLocation, index + 1]), orientation);
-			const totalSize = firstViewSize + secondViewSize;
-			this.gridview.resizeView(location, Math.floor(totalSize / 2));
-
-		} else {
-			const [parentLocation,] = tail(location);
-			this.gridview.distributeViewSizes(parentLocation);
-		}
+		const [parentLocation,] = tail(location);
+		this.gridview.distributeViewSizes(parentLocation);
 	}
 }
 
@@ -563,8 +546,11 @@ export class SerializableGrid<T extends ISerializableView> extends Grid<T> {
 			const childLocation = [...location, i];
 
 			if (i < node.children.length - 1) {
-				const size = orientation === Orientation.VERTICAL ? child.box.height : child.box.width;
-				this.gridview.resizeView(childLocation, Math.floor(size * scale));
+				const size = orientation === Orientation.VERTICAL
+					? { height: Math.floor(child.box.height * scale) }
+					: { width: Math.floor(child.box.width * scale) };
+
+				this.gridview.resizeView(childLocation, size);
 			}
 
 			this.restoreViewsSize(childLocation, child, orthogonal(orientation), widthScale, heightScale);

src/vs/base/browser/ui/grid/gridview.ts

@@ -15,13 +15,18 @@ import { Color } from 'vs/base/common/color';
 export { Sizing, LayoutPriority } from 'vs/base/browser/ui/splitview/splitview';
 export { Orientation } from 'vs/base/browser/ui/sash/sash';
 
+export interface IViewSize {
+	readonly width: number;
+	readonly height: number;
+}
+
 export interface IView {
 	readonly element: HTMLElement;
 	readonly minimumWidth: number;
 	readonly maximumWidth: number;
 	readonly minimumHeight: number;
 	readonly maximumHeight: number;
-	readonly onDidChange: Event<{ width: number; height: number; } | undefined>;
+	readonly onDidChange: Event<IViewSize | undefined>;
 	readonly priority?: LayoutPriority;
 	readonly snapSize?: number;
 	layout(width: number, height: number, orientation: Orientation): void;
@@ -573,7 +578,7 @@ export class GridView implements IDisposable {
 	get maximumWidth(): number { return this.root.maximumHeight; }
 	get maximumHeight(): number { return this.root.maximumHeight; }
 
-	private _onDidChange = new Relay<{ width: number; height: number; } | undefined>();
+	private _onDidChange = new Relay<IViewSize | undefined>();
 	readonly onDidChange = this._onDidChange.event;
 
 	constructor(options: IGridViewOptions = {}) {
@@ -747,18 +752,33 @@ export class GridView implements IDisposable {
 		}
 	}
 
-	resizeView(location: number[], size: number): void {
+	resizeView(location: number[], { width, height }: Partial<IViewSize>): void {
 		const [rest, index] = tail(location);
-		const [, parent] = this.getNode(rest);
+		const [pathToParent, parent] = this.getNode(rest);
 
 		if (!(parent instanceof BranchNode)) {
 			throw new Error('Invalid location');
 		}
 
-		parent.resizeChild(index, size);
+		if (!width && !height) {
+			return;
+		}
+
+		const [parentSize, grandParentSize] = parent.orientation === Orientation.HORIZONTAL ? [width, height] : [height, width];
+
+		if (typeof grandParentSize === 'number' && pathToParent.length > 0) {
+			const [, grandParent] = tail(pathToParent);
+			const [, parentIndex] = tail(rest);
+
+			grandParent.resizeChild(parentIndex, grandParentSize);
+		}
+
+		if (typeof parentSize === 'number') {
+			parent.resizeChild(index, parentSize);
+		}
 	}
 
-	getViewSize(location: number[]): { width: number; height: number; } {
+	getViewSize(location: number[]): IViewSize {
 		const [, node] = this.getNode(location);
 		return { width: node.width, height: node.height };
 	}

src/vs/base/common/buffer.ts

@@ -164,23 +164,27 @@ export interface ReadableStream<T> {
 	/**
 	 * Stops emitting any events until resume() is called.
 	 */
-	pause(): void;
+	pause?(): void;
 
 	/**
 	 * Starts emitting events again after pause() was called.
 	 */
-	resume(): void;
+	resume?(): void;
 
 	/**
 	 * Destroys the stream and stops emitting any event.
 	 */
-	destroy(): void;
+	destroy?(): void;
 }
 
 /**
  * A readable stream that sends data via VSBuffer.
  */
-export interface VSBufferReadableStream extends ReadableStream<VSBuffer> { }
+export interface VSBufferReadableStream extends ReadableStream<VSBuffer> {
+	pause(): void;
+	resume(): void;
+	destroy(): void;
+}
 
 export function isVSBufferReadableStream(obj: any): obj is VSBufferReadableStream {
 	const candidate: VSBufferReadableStream = obj;
@@ -248,10 +252,10 @@ export function bufferToStream(buffer: VSBuffer): VSBufferReadableStream {
 /**
  * Helper to create a VSBufferStream from a Uint8Array stream.
  */
-export function toVSBufferReadableStream(stream: ReadableStream<Uint8Array>): VSBufferReadableStream {
+export function toVSBufferReadableStream(stream: ReadableStream<Uint8Array | string>): VSBufferReadableStream {
 	const vsbufferStream = writeableBufferStream();
 
-	stream.on('data', data => vsbufferStream.write(VSBuffer.wrap(data)));
+	stream.on('data', data => vsbufferStream.write(typeof data === 'string' ? VSBuffer.fromString(data) : VSBuffer.wrap(data)));
 	stream.on('end', () => vsbufferStream.end());
 	stream.on('error', error => vsbufferStream.error(error));