Implement a grid editor layout feature

extensions/theme-abyss/themes/abyss-color-theme.json

@@ -365,7 +365,6 @@
 		// Workbench: Editors
 		// "editorGroupHeader.noTabsBackground": "",
 		"editorGroup.border": "#2b2b4a",
-		"editorGroup.background": "#1c1c2a",
 		"editorGroup.dropBackground": "#25375daa",
 		"editorGroupHeader.tabsBackground": "#1c1c2a",
 

extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json

@@ -19,7 +19,6 @@
 		"editorWidget.background": "#131510",
 		"editorHoverWidget.background": "#221a14",
 		"editorGroupHeader.tabsBackground": "#131510",
-		"editorGroup.background": "#0f0c08",
 		"editorLineNumber.activeForeground": "#adadad",
 		"tab.inactiveBackground": "#131510",
 		"titleBar.activeBackground": "#423523",

extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json

@@ -21,7 +21,6 @@
 		"editorIndentGuide.background": "#505037",
 		"editorIndentGuide.activeBackground": "#707057",
 		"editorGroupHeader.tabsBackground": "#282828",
-		"editorGroup.background": "#1e1e1e",
 		"tab.inactiveBackground": "#404040",
 		"tab.border": "#303030",
 		"tab.inactiveForeground": "#d8d8d8",

extensions/theme-red/themes/Red-color-theme.json

@@ -15,7 +15,6 @@
 		// editor
 		"editor.background": "#390000",
 		"editorGroup.border": "#ff666633",
-		"editorGroup.background": "#1c0101",
 		"editorCursor.foreground": "#970000",
 		"editor.foreground": "#F8F8F8",
 		"editorWhitespace.foreground": "#c10000",

extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json

@@ -413,7 +413,6 @@
 		// Workbench: Editors
 		// "editorGroupHeader.noTabsBackground": "",
 		"editorGroup.border": "#00212B",
-		"editorGroup.background": "#011b23",
 		"editorGroup.dropBackground": "#2AA19844",
 		"editorGroupHeader.tabsBackground": "#004052",
 

extensions/theme-solarized-light/themes/solarized-light-color-theme.json

@@ -409,7 +409,6 @@
 		// Workbench: Editors
 		// "editorGroupHeader.noTabsBackground": "",
 		"editorGroup.border": "#DDD6C1",
-		"editorGroup.background": "#FFFBF2",
 		"editorGroup.dropBackground": "#DDD6C1AA",
 		"editorGroupHeader.tabsBackground": "#D9D2C2",
 

extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json

@@ -23,7 +23,6 @@
 		"editorHoverWidget.border": "#ffffff44",
 		"editorGroup.border": "#404f7d",
 		"editorGroupHeader.tabsBackground": "#001733",
-		"editorGroup.background": "#1c1c2a",
 		"editorGroup.dropBackground": "#25375daa",
 		"peekViewResult.background": "#001c40",
 		"tab.inactiveBackground": "#001c40",

extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts

@@ -133,7 +133,7 @@ suite('window namespace tests', () => {
 		}
 	});
 
-	test('issue #25801 - default column when opening a file', async () => {
+	test('default column when opening a file', async () => {
 		const [docA, docB, docC] = await Promise.all([
 			workspace.openTextDocument(await createRandomFile()),
 			workspace.openTextDocument(await createRandomFile()),
@@ -153,7 +153,7 @@ suite('window namespace tests', () => {
 			`wanted fileName:${editor.document.fileName}/viewColumn:${editor.viewColumn} but got fileName:${window.activeTextEditor!.document.fileName}/viewColumn:${window.activeTextEditor!.viewColumn}. a:${docA.fileName}, b:${docB.fileName}, c:${docC.fileName}`
 		);
 		assert.ok(window.activeTextEditor!.document === docC);
-		assert.equal(window.activeTextEditor!.viewColumn, ViewColumn.One);
+		assert.equal(window.activeTextEditor!.viewColumn, ViewColumn.Two);
 	});
 
 	test('issue #27408 - showTextDocument & vscode.diff always default to ViewColumn.One', async () => {

src/vs/base/browser/dnd.ts

@@ -70,3 +70,15 @@ export const DataTransfers = {
 	 */
 	TEXT: 'text/plain'
 };
+
+export function applyDragImage(event: DragEvent, label: string, clazz: string): void {
+	const dragImage = document.createElement('div');
+	dragImage.className = clazz;
+	dragImage.textContent = label;
+
+	document.body.appendChild(dragImage);
+	event.dataTransfer.setDragImage(dragImage, -10, -10);
+
+	// Removes the element when the DND operation is done
+	setTimeout(() => document.body.removeChild(dragImage), 0);
+}

src/vs/base/browser/dom.ts

@@ -723,14 +723,22 @@ export function isAncestor(testChild: Node, testAncestor: Node): boolean {
 	return false;
 }
 
-export function findParentWithClass(node: HTMLElement, clazz: string, stopAtClazz?: string): HTMLElement {
+export function findParentWithClass(node: HTMLElement, clazz: string, stopAtClazzOrNode?: string | HTMLElement): HTMLElement {
 	while (node) {
 		if (hasClass(node, clazz)) {
 			return node;
 		}
 
-		if (stopAtClazz && hasClass(node, stopAtClazz)) {
-			return null;
+		if (stopAtClazzOrNode) {
+			if (typeof stopAtClazzOrNode === 'string') {
+				if (hasClass(node, stopAtClazzOrNode)) {
+					return null;
+				}
+			} else {
+				if (node === stopAtClazzOrNode) {
+					return null;
+				}
+			}
 		}
 
 		node = <HTMLElement>node.parentNode;