fix microsoft#84425

joaomoreno · joaomoreno · commit 1bd3750d655b · 2019-11-26T16:10:55.000+01:00
diff --git a/src/vs/base/browser/ui/grid/grid.ts b/src/vs/base/browser/ui/grid/grid.ts
@@ -605,7 +605,7 @@ export type GridNodeDescriptor = { size?: number, groups?: GridNodeDescriptor[]
 export type GridDescriptor = { orientation: Orientation, groups?: GridNodeDescriptor[] };
 
 export function sanitizeGridNodeDescriptor(nodeDescriptor: GridNodeDescriptor): void {
-	if (nodeDescriptor.groups && nodeDescriptor.groups.length === 0) {
+	if (nodeDescriptor.groups && nodeDescriptor.groups.length <= 1) {
 		nodeDescriptor.groups = undefined;
 	}
 
diff --git a/src/vs/base/test/browser/ui/grid/grid.test.ts b/src/vs/base/test/browser/ui/grid/grid.test.ts
@@ -7,6 +7,7 @@ import * as assert from 'assert';
 import { Direction, getRelativeLocation, Orientation, SerializableGrid, ISerializableView, IViewDeserializer, GridNode, Sizing, isGridBranchNode, sanitizeGridNodeDescriptor, GridNodeDescriptor, createSerializedGrid, Grid } from 'vs/base/browser/ui/grid/grid';
 import { TestView, nodesToArrays } from './util';
 import { deepClone } from 'vs/base/common/objects';
+import { Event } from 'vs/base/common/event';
 
 // Simple example:
 //
@@ -814,6 +815,33 @@ suite('SerializableGrid', function () {
 		});
 	});
 
+	test('createSerializedGrid - issue #85601, should not allow single children groups', () => {
+		const serializedGrid = createSerializedGrid({ orientation: Orientation.HORIZONTAL, groups: [{ groups: [{}, {}], size: 0.5 }, { groups: [{}], size: 0.5 }] });
+		const views: ISerializableView[] = [];
+		const deserializer = new class implements IViewDeserializer<ISerializableView> {
+			fromJSON(): ISerializableView {
+				const view: ISerializableView = {
+					element: document.createElement('div'),
+					layout: () => null,
+					minimumWidth: 0,
+					maximumWidth: Number.POSITIVE_INFINITY,
+					minimumHeight: 0,
+					maximumHeight: Number.POSITIVE_INFINITY,
+					onDidChange: Event.None,
+					toJSON: () => ({})
+				};
+				views.push(view);
+				return view;
+			}
+		};
+
+		const grid = SerializableGrid.deserialize(serializedGrid, deserializer);
+		assert.equal(views.length, 3);
+
+		// should not throw
+		grid.removeView(views[2]);
+	});
+
 	test('serialize should store visibility and previous size', function () {
 		const view1 = new TestSerializableView('view1', 50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
 		const grid = new SerializableGrid(view1);

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ export type GridNodeDescriptor = { size?: number, groups?: GridNodeDescriptor[]`
`605`	`605`	`export type GridDescriptor = { orientation: Orientation, groups?: GridNodeDescriptor[] };`
`606`	`606`
`607`	`607`	`export function sanitizeGridNodeDescriptor(nodeDescriptor: GridNodeDescriptor): void {`
`608`		`- if (nodeDescriptor.groups && nodeDescriptor.groups.length === 0) {`
	`608`	`+ if (nodeDescriptor.groups && nodeDescriptor.groups.length <= 1) {`
`609`	`609`	`nodeDescriptor.groups = undefined;`
`610`	`610`	`}`
`611`	`611`