From 94094e2a6d207429c5c51f7a07b18e8fe24db2ef Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Fri, 18 May 2018 13:11:41 +0200
Subject: [PATCH] grid - fix to set height: 100% on editor container

---
 .../editor2/media/nextEditorGroupView.css     | 21 +++++++++++++------
 .../parts/editor2/nextEditorControl.ts        |  3 ++-
 test/smoke/src/application.ts                 |  2 +-
 test/smoke/src/areas/editor/editors.ts        |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor2/media/nextEditorGroupView.css b/src/vs/workbench/browser/parts/editor2/media/nextEditorGroupView.css
index 791069e13bd..b1fd2d79aae 100644
--- a/src/vs/workbench/browser/parts/editor2/media/nextEditorGroupView.css
+++ b/src/vs/workbench/browser/parts/editor2/media/nextEditorGroupView.css
@@ -38,12 +38,7 @@
 	overflow: hidden;
 }
 
-.monaco-workbench > .part.editor > .content .editor-group-container > .editor-container {
-	height: calc(100% - 35px); /* below title control */
-}
-
-.monaco-workbench > .part.editor > .content .editor-group-container.empty > .title,
-.monaco-workbench > .part.editor > .content .editor-group-container.empty > .editor-container  {
+.monaco-workbench > .part.editor > .content .editor-group-container.empty > .title {
 	display: none;
 }
 
@@ -79,4 +74,18 @@
 .vs-dark .monaco-workbench > .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group,
 .hc-black .monaco-workbench > .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
 	background-image: url('close-inverse.svg');
+}
+
+/* Editor */
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .editor-container {
+	height: calc(100% - 35px); /* below title control */
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container.empty > .editor-container  {
+	display: none;
+}
+
+.monaco-workbench > .part.editor > .content .editor-group-container > .editor-container > .editor-instance {
+	height: 100%;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor2/nextEditorControl.ts b/src/vs/workbench/browser/parts/editor2/nextEditorControl.ts
index 1f1ccfb156e..7fcafa7df5a 100644
--- a/src/vs/workbench/browser/parts/editor2/nextEditorControl.ts
+++ b/src/vs/workbench/browser/parts/editor2/nextEditorControl.ts
@@ -7,7 +7,7 @@
 
 import { Disposable } from 'vs/base/common/lifecycle';
 import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
-import { Dimension, show, hide } from 'vs/base/browser/dom';
+import { Dimension, show, hide, addClass } from 'vs/base/browser/dom';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IEditorRegistry, Extensions as EditorExtensions, IEditorDescriptor } from 'vs/workbench/browser/editor';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -95,6 +95,7 @@ export class NextEditorControl extends Disposable {
 		// Create editor container as needed
 		if (!control.getContainer()) {
 			const controlInstanceContainer = document.createElement('div');
+			addClass(controlInstanceContainer, 'editor-instance');
 			controlInstanceContainer.id = descriptor.getId();
 
 			control.create(controlInstanceContainer);
diff --git a/test/smoke/src/application.ts b/test/smoke/src/application.ts
index 59f2e6a13c0..4894252466c 100644
--- a/test/smoke/src/application.ts
+++ b/test/smoke/src/application.ts
@@ -63,7 +63,7 @@ export class Application {
 	async start(): Promise<any> {
 		await this._start();
 		await this.code.waitForElement('.explorer-folders-view');
-		await this.code.waitForActiveElement(`.editor-container[id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`);
+		await this.code.waitForActiveElement(`.editor-instance[id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`);
 	}
 
 	async restart(options: { workspaceOrFolder?: string, extraArgs?: string[] }): Promise<any> {
diff --git a/test/smoke/src/areas/editor/editors.ts b/test/smoke/src/areas/editor/editors.ts
index 5ac99c68e8c..50f244e8ed8 100644
--- a/test/smoke/src/areas/editor/editors.ts
+++ b/test/smoke/src/areas/editor/editors.ts
@@ -23,7 +23,7 @@ export class Editors {
 	}
 
 	async waitForActiveEditor(filename: string): Promise<any> {
-		const selector = `.editor-container .monaco-editor[data-uri$="${filename}"] textarea`;
+		const selector = `.editor-instance .monaco-editor[data-uri$="${filename}"] textarea`;
 		return this.code.waitForActiveElement(selector);
 	}
 
-- 
GitLab