Merge branch 'master' into tyriar/46696_terminal_env

src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts

@@ -169,8 +169,9 @@ export class TestNotebookEditor implements INotebookEditor {
 		// throw new Error('Method not implemented.');
 		return;
 	}
-	layoutNotebookCell(cell: CellViewModel, height: number): void {
+	async layoutNotebookCell(cell: CellViewModel, height: number): Promise<void> {
 		// throw new Error('Method not implemented.');
+		return;
 	}
 	createInset(cell: CellViewModel, output: IOutput, shadowContent: string, offset: number): void {
 		// throw new Error('Method not implemented.');

src/vs/workbench/contrib/output/browser/output.contribution.ts

@@ -63,6 +63,7 @@ const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewC
 	name: nls.localize('output', "Output"),
 	order: 1,
 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [OUTPUT_VIEW_ID, OUTPUT_VIEW_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]),
+	hideIfEmpty: true,
 	focusCommand: { id: toggleOutputAcitonId, keybindings: toggleOutputActionKeybindings }
 }, ViewContainerLocation.Panel);